Skip to content

Commit

Permalink
Rename project file (#3749)
Browse files Browse the repository at this point in the history
Task/Issue URL: https://app.asana.com/0/72649045549333/1209154396013375/f
Tech Design URL:
CC:

Description:

This PR renames the project file from DuckDuckGo to DuckDuckGo-macOS.
  • Loading branch information
samsymons authored Jan 24, 2025
1 parent ae1f8dc commit 3c6dbaf
Show file tree
Hide file tree
Showing 34 changed files with 113 additions and 101 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos_pir_end_to_end_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ jobs:
- name: Set cache key hash
run: |
cd main
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ jobs:

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down Expand Up @@ -345,9 +345,9 @@ jobs:

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos_sync_end_to_end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ jobs:

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down Expand Up @@ -138,8 +138,8 @@ jobs:
-i '/Scheme/LaunchAction/EnvironmentVariables/EnvironmentVariable[1]' -t attr -n "key" -v "CODE" \
-i '/Scheme/LaunchAction/EnvironmentVariables/EnvironmentVariable[1]' -t attr -n "value" -v "$CODE" \
-i '/Scheme/LaunchAction/EnvironmentVariables/EnvironmentVariable[1]' -t attr -n "isEnabled" -v "YES" \
"DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests CI.xcscheme" > updated.xcscheme
mv -f updated.xcscheme "DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests CI.xcscheme"
"DuckDuckGo-macOS.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests CI.xcscheme" > updated.xcscheme
mv -f updated.xcscheme "DuckDuckGo-macOS.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests CI.xcscheme"
defaults write com.duckduckgo.macos.browser.review sync.environment Development
defaults write com.duckduckgo.macos.browser.review moveToApplicationsFolderAlertSuppress 1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/macos_sync_end_to_end_legacy_os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ jobs:

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down Expand Up @@ -104,9 +104,9 @@ jobs:
- name: Build test runner
run: |
rm -rf LocalPackages
rm -rf /Users/runner/work/macos-browser/macos-browser/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
sed -i '' '/\/\* Begin XCSwiftPackageProductDependency section \*\//,/\/\* End XCSwiftPackageProductDependency section \*\//d' DuckDuckGo.xcodeproj/project.pbxproj
sed -i '' '/\/\* Begin XCRemoteSwiftPackageReference section \*\//,/\/\* End XCRemoteSwiftPackageReference section \*\//d' DuckDuckGo.xcodeproj/project.pbxproj
rm -rf /Users/runner/work/macos-browser/macos-browser/DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
sed -i '' '/\/\* Begin XCSwiftPackageProductDependency section \*\//,/\/\* End XCSwiftPackageProductDependency section \*\//d' DuckDuckGo-macOS.xcodeproj/project.pbxproj
sed -i '' '/\/\* Begin XCRemoteSwiftPackageReference section \*\//,/\/\* End XCRemoteSwiftPackageReference section \*\//d' DuckDuckGo-macOS.xcodeproj/project.pbxproj
set -o pipefail && xcodebuild build-for-testing \
-scheme "SyncE2EUITestsOldVersions" \
-derivedDataPath DerivedData \
Expand Down Expand Up @@ -162,4 +162,4 @@ jobs:
xcodebuild.log
DerivedData/Logs/Test/*.xcresult
~/Library/Logs/DiagnosticReports/*
retention-days: 7
retention-days: 7
4 changes: 2 additions & 2 deletions .github/workflows/macos_ui_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ jobs:

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
if [[ "$has_only_tags" == "true" ]]; then
echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
echo "cache_key_hash=${{ hashFiles('DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
else
echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10668,7 +10668,7 @@
};
};
};
buildConfigurationList = AA585D79248FD31100E9A3E2 /* Build configuration list for PBXProject "DuckDuckGo" */;
buildConfigurationList = AA585D79248FD31100E9A3E2 /* Build configuration list for PBXProject "DuckDuckGo-macOS" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand Down Expand Up @@ -15261,7 +15261,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
AA585D79248FD31100E9A3E2 /* Build configuration list for PBXProject "DuckDuckGo" */ = {
AA585D79248FD31100E9A3E2 /* Build configuration list for PBXProject "DuckDuckGo-macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
AA585DA2248FD31500E9A3E2 /* Debug */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
BlueprintIdentifier = "9D84E3FA2CD4E66F0046CD8B"
BuildableName = "DBPE2ETests.xctest"
BlueprintName = "DBPE2ETests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BlueprintIdentifier = "3706FA6A293F65D500E42796"
BuildableName = "DuckDuckGo App Store.app"
BlueprintName = "DuckDuckGo Privacy Browser App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -31,7 +31,7 @@
BlueprintIdentifier = "3706FDD3293F661700E42796"
BuildableName = "Unit Tests App Store.xctest"
BlueprintName = "Unit Tests App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -45,7 +45,7 @@
BlueprintIdentifier = "3706FE9B293F662100E42796"
BuildableName = "Integration Tests App Store.xctest"
BlueprintName = "Integration Tests App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -68,7 +68,7 @@
BlueprintIdentifier = "3706FA6A293F65D500E42796"
BuildableName = "DuckDuckGo App Store.app"
BlueprintName = "DuckDuckGo Privacy Browser App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
Expand All @@ -91,7 +91,7 @@
BlueprintIdentifier = "3706FDD3293F661700E42796"
BuildableName = "Unit Tests App Store.xctest"
BlueprintName = "Unit Tests App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Expand Down Expand Up @@ -136,7 +136,7 @@
BlueprintIdentifier = "3706FE9B293F662100E42796"
BuildableName = "Integration Tests App Store.xctest"
BlueprintName = "Integration Tests App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Expand Down Expand Up @@ -255,7 +255,7 @@
BlueprintIdentifier = "3706FA6A293F65D500E42796"
BuildableName = "DuckDuckGo App Store.app"
BlueprintName = "DuckDuckGo Privacy Browser App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
Expand All @@ -281,7 +281,7 @@
BlueprintIdentifier = "3706FA6A293F65D500E42796"
BuildableName = "DuckDuckGo App Store.app"
BlueprintName = "DuckDuckGo Privacy Browser App Store"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BlueprintIdentifier = "AA585D7D248FD31100E9A3E2"
BuildableName = "DuckDuckGo.app"
BlueprintName = "DuckDuckGo Privacy Browser"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -31,7 +31,7 @@
BlueprintIdentifier = "4B1AD89C25FC27E200261379"
BuildableName = "Integration Tests.xctest"
BlueprintName = "Integration Tests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -45,7 +45,7 @@
BlueprintIdentifier = "AA585D8F248FD31400E9A3E2"
BuildableName = "Unit Tests.xctest"
BlueprintName = "Unit Tests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand Down Expand Up @@ -97,7 +97,7 @@
BlueprintIdentifier = "4B1AD89C25FC27E200261379"
BuildableName = "Integration Tests.xctest"
BlueprintName = "Integration Tests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
Expand All @@ -120,7 +120,7 @@
BlueprintIdentifier = "AA585D8F248FD31400E9A3E2"
BuildableName = "Unit Tests.xctest"
BlueprintName = "Unit Tests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Expand Down Expand Up @@ -168,7 +168,7 @@
BlueprintIdentifier = "4B1AD89C25FC27E200261379"
BuildableName = "Integration Tests.xctest"
BlueprintName = "Integration Tests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Expand Down Expand Up @@ -324,7 +324,7 @@
BlueprintIdentifier = "AA585D7D248FD31100E9A3E2"
BuildableName = "DuckDuckGo.app"
BlueprintName = "DuckDuckGo Privacy Browser"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
Expand Down Expand Up @@ -355,7 +355,7 @@
BlueprintIdentifier = "AA585D7D248FD31100E9A3E2"
BuildableName = "DuckDuckGo.app"
BlueprintName = "DuckDuckGo Privacy Browser"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BlueprintIdentifier = "4B9579252AC7AE700062CA31"
BuildableName = "DuckDuckGo Privacy Pro.app"
BlueprintName = "DuckDuckGo Privacy Pro"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -46,7 +46,7 @@
BlueprintIdentifier = "4B9579252AC7AE700062CA31"
BuildableName = "DuckDuckGo Privacy Pro.app"
BlueprintName = "DuckDuckGo Privacy Pro"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -63,7 +63,7 @@
BlueprintIdentifier = "4B9579252AC7AE700062CA31"
BuildableName = "DuckDuckGo Privacy Pro.app"
BlueprintName = "DuckDuckGo Privacy Pro"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
BlueprintIdentifier = "7B96D0CE2ADFDA7E007E02C8"
BuildableName = "DuckDuckGoDBPTests.xctest"
BlueprintName = "DuckDuckGoDBPTests"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BlueprintIdentifier = "4B4BEC1F2A11B4E2001D9AC5"
BuildableName = "DuckDuckGo Notifications.app"
BlueprintName = "DuckDuckGoNotifications"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -47,7 +47,7 @@
BlueprintIdentifier = "4B4BEC1F2A11B4E2001D9AC5"
BuildableName = "DuckDuckGo Notifications.app"
BlueprintName = "DuckDuckGoNotifications"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -64,7 +64,7 @@
BlueprintIdentifier = "4B4BEC1F2A11B4E2001D9AC5"
BuildableName = "DuckDuckGo Notifications.app"
BlueprintName = "DuckDuckGoNotifications"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BlueprintIdentifier = "4B2D06382A11CFBA00DE1F49"
BuildableName = "DuckDuckGo VPN.app"
BlueprintName = "DuckDuckGoVPN"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -46,7 +46,7 @@
BlueprintIdentifier = "4B2D06382A11CFBA00DE1F49"
BuildableName = "DuckDuckGo VPN.app"
BlueprintName = "DuckDuckGoVPN"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -63,7 +63,7 @@
BlueprintIdentifier = "4B2D06382A11CFBA00DE1F49"
BuildableName = "DuckDuckGo VPN.app"
BlueprintName = "DuckDuckGoVPN"
ReferencedContainer = "container:DuckDuckGo.xcodeproj">
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Loading

0 comments on commit 3c6dbaf

Please sign in to comment.