-
Notifications
You must be signed in to change notification settings - Fork 423
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into daniel/settings-swiftui
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo/Base.lproj/Settings.storyboard # DuckDuckGo/SettingsViewController.swift # DuckDuckGo/UserText.swift
- Loading branch information
Showing
78 changed files
with
4,034 additions
and
637 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ on: | |
| - cron: '0 5 * * *' # run at 5 AM UTC | ||
|
|
||
| jobs: | ||
| sync-end-to-end-tests: | ||
| name: Sync End to end Tests | ||
| build-for-sync-end-to-end-tests: | ||
| name: Build for Sync End To End Tests | ||
| runs-on: macos-13 | ||
| timeout-minutes: 30 | ||
|
|
||
| steps: | ||
| - name: Check out the code | ||
|
|
@@ -17,7 +18,7 @@ jobs: | |
|
|
||
| - name: Set cache key hash | ||
| run: | | ||
| has_only_tags=$(jq '[ .object.pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved) | ||
| has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.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 | ||
| else | ||
|
|
@@ -42,63 +43,78 @@ jobs: | |
| -scheme "DuckDuckGo" \ | ||
| -destination "platform=iOS Simulator,name=iPhone 14" \ | ||
| -derivedDataPath "DerivedData" \ | ||
| -skipPackagePluginValidation \ | ||
| | tee xcodebuild.log | ||
| - name: Store Binary | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: duckduckgo-ios-app | ||
| path: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app | ||
|
|
||
| - name: Upload logs when workflow failed | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() | ||
| with: | ||
| name: BuildLogs | ||
| path: | | ||
| xcodebuild.log | ||
| DerivedData/Logs/Test/*.xcresult | ||
| retention-days: 7 | ||
|
|
||
| sync-end-to-end-tests: | ||
| name: Sync End To End Tests | ||
| needs: build-for-sync-end-to-end-tests | ||
| runs-on: macos-13 | ||
| timeout-minutes: 60 | ||
| strategy: | ||
| matrix: | ||
| os-version: [15, 16, 17] | ||
| max-parallel: 1 # Uncomment this line to run tests sequentially. | ||
| fail-fast: false | ||
|
|
||
| steps: | ||
| - name: Check out the code | ||
| uses: actions/checkout@v3 # Don't need submodules here as this is only for the tests folder | ||
|
|
||
| - name: Create test account for Sync and return the recovery code | ||
| uses: duckduckgo/sync_crypto/action@main | ||
| id: sync-recovery-code | ||
| with: | ||
| debug: true | ||
|
|
||
| - name: Sync e2e tests - iOS 15 | ||
| uses: mobile-dev-inc/[email protected] | ||
| with: | ||
| api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} | ||
| app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app | ||
| workspace: .maestro | ||
| include-tags: sync | ||
| env: | | ||
| CODE=${{ steps.sync-recovery-code.outputs.recovery-code }} | ||
| - name: Sync e2e tests - iOS 16 | ||
| uses: mobile-dev-inc/[email protected] | ||
| - name: Retrieve Binary | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} | ||
| app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app | ||
| ios-version: 16 | ||
| workspace: .maestro | ||
| include-tags: sync | ||
| env: | | ||
| CODE=${{ steps.sync-recovery-code.outputs.recovery-code }} | ||
| name: duckduckgo-ios-app | ||
| path: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app | ||
|
|
||
| - name: Sync e2e tests - iOS 17 | ||
| - name: Sync e2e tests | ||
| uses: mobile-dev-inc/[email protected] | ||
| with: | ||
| api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} | ||
| app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app | ||
| ios-version: 17 | ||
| ios-version: ${{ matrix.os-version }} | ||
| workspace: .maestro | ||
| include-tags: sync | ||
| env: | | ||
| CODE=${{ steps.sync-recovery-code.outputs.recovery-code }} | ||
| - name: Create Asana task when workflow failed | ||
| if: ${{ failure() }} | ||
| run: | | ||
| curl -s "https://app.asana.com/api/1.0/tasks" \ | ||
| --header "Accept: application/json" \ | ||
| --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \ | ||
| --header "Content-Type: application/json" \ | ||
| --data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.GH_ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }' | ||
| notify-failure: | ||
| name: Notify on failure | ||
| if: ${{ always() && contains(join(needs.*.result, ','), 'failure') }} | ||
| needs: [build-for-sync-end-to-end-tests, sync-end-to-end-tests] | ||
| runs-on: ubuntu-latest | ||
|
|
||
| - name: Upload logs when workflow failed | ||
| uses: actions/upload-artifact@v3 | ||
| if: failure() | ||
| with: | ||
| name: BuildLogs | ||
| path: | | ||
| xcodebuild.log | ||
| DerivedData/Logs/Test/*.xcresult | ||
| retention-days: 7 | ||
| steps: | ||
| - name: Create Asana task when workflow failed | ||
| run: | | ||
| curl -s "https://app.asana.com/api/1.0/tasks" \ | ||
| --header "Accept: application/json" \ | ||
| --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \ | ||
| --header "Content-Type: application/json" \ | ||
| --data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.GH_ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }' | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,28 @@ | ||
| appId: com.duckduckgo.mobile.ios | ||
| --- | ||
|
|
||
| - tapOn: Logins | ||
| - assertVisible: Unlock device to access saved Logins | ||
| - tapOn: Passwords | ||
| - tapOn: Passcode field | ||
| - inputText: "0000" | ||
| - pressKey: Enter | ||
| - assertVisible: Dax Login | ||
| - tapOn: Dax Login | ||
| - assertVisible: daxthetest | ||
| - assertVisible: duckduckgo.com | ||
| - tapOn: Logins | ||
| - tapOn: Passwords | ||
| - assertVisible: Github | ||
| - tapOn: Github | ||
| - assertVisible: githubusername | ||
| - assertVisible: github.com | ||
| - tapOn: Logins | ||
| - tapOn: Passwords | ||
| - assertVisible: StackOverflow | ||
| - tapOn: StackOverflow | ||
| - assertVisible: stacker | ||
| - assertVisible: stackoverflow.com | ||
| - tapOn: Logins | ||
| - tapOn: Passwords | ||
| - assertVisible: My Personal Website | ||
| - tapOn: My Personal Website | ||
| - assertVisible: [email protected] | ||
| - assertVisible: mypersonalwebsite.com | ||
| - tapOn: Logins | ||
| - tapOn: Settings | ||
| - tapOn: Passwords | ||
| - tapOn: Settings |
Oops, something went wrong.