-
Notifications
You must be signed in to change notification settings - Fork 11
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 graeme/geoswitching
* main: (48 commits) Add additional VPN startup pixels (#1975) Updates to Autofill Logins copy (#1924) Bump version to 1.69.0 (95) Remove the reconnect/disconnect logic from the connection tester (#1970) Set marketing version to 1.69.0 Update embedded files DBP: Send internal user param for dbp waitlist pixels (#1972) Move release task to proper section in Code Freeze workflow (#1977) drop Main.storyboard (#1944) Add GHA workflow to cut release branch (#1976) Move DBP tests into main target (#1974) Use static date for PixelKit tests (#1973) Remove DBP test target (#1961) Fix date generator for time machine (#1969) Improve sync set up error handling (#1966) remove QR code from save recovery PDF view (#1968) change order of items in autofill add new item (#1967) Fix PR Checks workflow (#1962) Bump version to 1.68.0 (93) Update embedded files ...
- Loading branch information
Showing
167 changed files
with
2,236 additions
and
2,299 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| name: Bump Internal Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| asana-task-url: | ||
| description: "Asana release task URL" | ||
| required: true | ||
| type: string | ||
|
|
||
| jobs: | ||
|
|
||
| update_embedded_files: | ||
|
|
||
| name: Update Embedded Files | ||
|
|
||
| runs-on: macos-13-xlarge | ||
| timeout-minutes: 10 | ||
|
|
||
| steps: | ||
|
|
||
| - name: Assert release branch | ||
| run: | | ||
| case "${{ github.ref }}" in | ||
| refs/heads/release/*) ;; | ||
| *) echo "👎 Not a release branch"; exit 1 ;; | ||
| esac | ||
| - name: Check out the code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Select Xcode | ||
| run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer | ||
|
|
||
| - name: Prepare fastlane | ||
| run: bundle install | ||
|
|
||
| - name: Update embedded files | ||
| env: | ||
| APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} | ||
| APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} | ||
| APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} | ||
| run: | | ||
| git config --global user.name "Dax the Duck" | ||
| git config --global user.email "dax@duckduckgo.com" | ||
| bundle exec fastlane update_embedded_files | ||
| run_tests: | ||
|
|
||
| name: Run Tests | ||
|
|
||
| needs: update_embedded_files | ||
| uses: ./.github/workflows/pr.yml | ||
| secrets: | ||
| ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} | ||
|
|
||
| increment_build_number: | ||
|
|
||
| name: Increment Build Number | ||
|
|
||
| needs: run_tests | ||
| runs-on: macos-13-xlarge | ||
| timeout-minutes: 10 | ||
|
|
||
| steps: | ||
|
|
||
| - name: Check out the code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
| ref: ${{ github.ref_name }} | ||
|
|
||
| - name: Select Xcode | ||
| run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer | ||
|
|
||
| - name: Prepare fastlane | ||
| run: bundle install | ||
|
|
||
| - name: Increment build number | ||
| env: | ||
| APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} | ||
| APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} | ||
| APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} | ||
| run: | | ||
| git config --global user.name "Dax the Duck" | ||
| git config --global user.email "dax@duckduckgo.com" | ||
| bundle exec fastlane bump_internal_release update_embedded_files:false | ||
| prepare_release: | ||
| name: Prepare Release | ||
| needs: increment_build_number | ||
| uses: ./.github/workflows/release.yml | ||
| with: | ||
| asana-task-url: ${{ github.event.inputs.asana-task-url }} | ||
| secrets: | ||
| BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} | ||
| P12_PASSWORD: ${{ secrets.P12_PASSWORD }} | ||
| KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} | ||
| REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }} | ||
| RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }} | ||
| DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }} | ||
| DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }} | ||
| NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }} | ||
| NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }} | ||
| NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }} | ||
| NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }} | ||
| NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }} | ||
| NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }} | ||
| APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} | ||
| APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} | ||
| APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} | ||
| ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} | ||
| MM_HANDLES_BASE64: ${{ secrets.MM_HANDLES_BASE64 }} | ||
| MM_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }} | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} | ||
| SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} |
Oops, something went wrong.