diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml index f57ad6c44a..b5bc170b5b 100644 --- a/.github/workflows/bump_internal_release.yml +++ b/.github/workflows/bump_internal_release.yml @@ -14,11 +14,11 @@ on: jobs: - update_embedded_files: + assert_release_branch: - name: Update Embedded Files + name: Assert Release Branch - runs-on: macos-13-xlarge + runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -30,32 +30,11 @@ jobs: *) echo "👎 Not a release branch"; exit 1 ;; esac - - name: Check out the code - uses: actions/checkout@v4 - 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 + # needs: assert_release_branch # uses: ./.github/workflows/pr.yml # secrets: # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} @@ -64,7 +43,7 @@ jobs: name: Increment Build Number - needs: update_embedded_files + needs: assert_release_branch runs-on: macos-13-xlarge timeout-minutes: 10 @@ -73,8 +52,9 @@ jobs: - name: Check out the code uses: actions/checkout@v4 with: - submodules: recursive + fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log ref: ${{ github.ref_name }} + submodules: recursive - name: Select Xcode run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer @@ -92,6 +72,19 @@ jobs: 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: ${{ github.event.inputs.asana-task-url }} + + - name: Populate release contents + env: + ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + GH_TOKEN: ${{ github.token }} + run: | + ./scripts/update_this_release_includes.sh ${{ steps.task-id.outputs.task-id }} + prepare_release: name: Prepare Release needs: increment_build_number diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml index 83038066d2..e51e87135f 100644 --- a/.github/workflows/code_freeze.yml +++ b/.github/workflows/code_freeze.yml @@ -28,7 +28,7 @@ jobs: - name: Check out the code uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log submodules: recursive - name: Prepare fastlane