diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml index 997711ddc3..dd02d2d1dc 100644 --- a/.github/workflows/bump_internal_release.yml +++ b/.github/workflows/bump_internal_release.yml @@ -37,13 +37,13 @@ jobs: steps: - - name: Assert release branch - run: | - case "${{ github.ref_name }}" in - release/*) ;; - main) ;; - *) echo "👎 Not a release or main branch"; exit 1 ;; - esac + # - name: Assert release branch + # run: | + # case "${{ github.ref_name }}" in + # release/*) ;; + # main) ;; + # *) echo "👎 Not a release or main branch"; exit 1 ;; + # esac - name: Check out the code uses: actions/checkout@v4 @@ -125,70 +125,70 @@ jobs: exit 1 fi - run_tests: + # run_tests: - name: Run Tests + # name: Run Tests - needs: validate_input_conditions + # needs: validate_input_conditions - if: needs.validate_input_conditions.outputs.skip-release == 'false' - uses: ./.github/workflows/pr.yml - with: - branch: ${{ needs.validate_input_conditions.outputs.release-branch }} - secrets: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # if: needs.validate_input_conditions.outputs.skip-release == 'false' + # uses: ./.github/workflows/pr.yml + # with: + # branch: ${{ needs.validate_input_conditions.outputs.release-branch }} + # secrets: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} - increment_build_number: + # increment_build_number: - name: Increment Build Number + # name: Increment Build Number - needs: [ validate_input_conditions, run_tests ] - runs-on: macos-13-xlarge - timeout-minutes: 10 + # needs: [ validate_input_conditions, run_tests ] + # runs-on: macos-13-xlarge + # timeout-minutes: 10 - steps: + # steps: - - name: Check out the code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log - ref: ${{ needs.validate_input_conditions.outputs.release-branch }} - submodules: recursive + # - name: Check out the code + # uses: actions/checkout@v4 + # with: + # fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log + # ref: ${{ needs.validate_input_conditions.outputs.release-branch }} + # submodules: recursive - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer + # - name: Select Xcode + # run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer - - name: Prepare fastlane - run: bundle install + # - 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 + # - 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 - - name: Extract Asana Task ID - id: task-id - uses: ./.github/actions/asana-extract-task-id - with: - task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} + # - name: Extract Asana Task ID + # id: task-id + # uses: ./.github/actions/asana-extract-task-id + # with: + # task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} - - name: Update Asana tasks for the release - env: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} - GH_TOKEN: ${{ github.token }} - BRANCH: ${{ needs.validate_input_conditions.outputs.release-branch }} - run: | - version="$(cut -d '/' -f 2 <<< "$BRANCH")" - ./scripts/update_asana_for_release.sh internal ${{ steps.task-id.outputs.task-id }} ${{ vars.MACOS_APP_BOARD_VALIDATION_SECTION_ID }} "${version}" + # - name: Update Asana tasks for the release + # env: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # GH_TOKEN: ${{ github.token }} + # BRANCH: ${{ needs.validate_input_conditions.outputs.release-branch }} + # run: | + # version="$(cut -d '/' -f 2 <<< "$BRANCH")" + # ./scripts/update_asana_for_release.sh internal ${{ steps.task-id.outputs.task-id }} ${{ vars.MACOS_APP_BOARD_VALIDATION_SECTION_ID }} "${version}" prepare_release: name: Prepare Release - needs: [ validate_input_conditions, increment_build_number ] + needs: [ validate_input_conditions ] uses: ./.github/workflows/release.yml with: asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} @@ -221,30 +221,30 @@ jobs: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} - tag_and_merge: - name: Tag and Merge Branch - needs: [ validate_input_conditions, prepare_release ] - uses: ./.github/workflows/tag_release.yml - with: - asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} - branch: ${{ needs.validate_input_conditions.outputs.release-branch }} - base-branch: ${{ github.event.inputs.base-branch || 'main' }} - prerelease: true - internal-release-bump: true - secrets: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} - GHA_ELEVATED_PERMISSIONS_TOKEN: ${{ secrets.GHA_ELEVATED_PERMISSIONS_TOKEN }} - - publish_release: - name: Publish DMG Release - needs: [ validate_input_conditions, tag_and_merge ] - uses: ./.github/workflows/publish_dmg_release.yml - with: - asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} - branch: ${{ needs.validate_input_conditions.outputs.release-branch }} - secrets: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} - AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }} - AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }} - GHA_ELEVATED_PERMISSIONS_TOKEN: ${{ secrets.GHA_ELEVATED_PERMISSIONS_TOKEN }} - SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }} + # tag_and_merge: + # name: Tag and Merge Branch + # needs: [ validate_input_conditions, prepare_release ] + # uses: ./.github/workflows/tag_release.yml + # with: + # asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} + # branch: ${{ needs.validate_input_conditions.outputs.release-branch }} + # base-branch: ${{ github.event.inputs.base-branch || 'main' }} + # prerelease: true + # internal-release-bump: true + # secrets: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # GHA_ELEVATED_PERMISSIONS_TOKEN: ${{ secrets.GHA_ELEVATED_PERMISSIONS_TOKEN }} + + # publish_release: + # name: Publish DMG Release + # needs: [ validate_input_conditions, tag_and_merge ] + # uses: ./.github/workflows/publish_dmg_release.yml + # with: + # asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }} + # branch: ${{ needs.validate_input_conditions.outputs.release-branch }} + # secrets: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }} + # AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }} + # GHA_ELEVATED_PERMISSIONS_TOKEN: ${{ secrets.GHA_ELEVATED_PERMISSIONS_TOKEN }} + # SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}