diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml index 72147bea62..87e86b2a47 100644 --- a/.github/workflows/bump_internal_release.yml +++ b/.github/workflows/bump_internal_release.yml @@ -30,17 +30,17 @@ jobs: *) echo "👎 Not a release branch"; exit 1 ;; esac + - name: Check out the code + uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }} + - 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: Check out the code - uses: actions/checkout@v4 - with: - ref: ${{ github.ref_name }} - - name: Validate release notes env: TASK_ID: ${{ steps.task-id.outputs.task-id }} @@ -49,8 +49,8 @@ jobs: curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}?opt_fields=notes" \ -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \ | jq -r .data.notes \ - | ./scripts/extract_release_notes.sh) > release_notes.txt - release_notes="$( release_notes.txt + release_notes="$(" ]]; then echo "::error::Release notes are empty. Please add release notes to the Asana task and restart the workflow." exit 1 diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml index 6158103a21..5a375f7331 100644 --- a/.github/workflows/code_freeze.yml +++ b/.github/workflows/code_freeze.yml @@ -37,11 +37,19 @@ jobs: git config --global user.name "Dax the Duck" git config --global user.email "dax@duckduckgo.com" bundle exec fastlane make_release_branch + + - name: Get Asana user ID + id: get-asana-user-id + uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main + with: + access-token: ${{ secrets.ASANA_ACCESS_TOKEN }} + github-handle: ${{ github.actor }} - name: Create release task id: create_release_task env: ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }} run: | version="$(echo ${{ steps.make_release_branch.outputs.release_branch_name }} | cut -d '/' -f 2)" task_name="macOS App Release $version" @@ -60,14 +68,11 @@ jobs: --output /dev/null \ -d "{\"data\": {\"task\": \"${asana_task_id}\"}}" - assignee_id="$(curl -fLSs https://raw.githubusercontent.com/duckduckgo/BrowserServicesKit/main/.github/actions/asana-failed-pr-checks/user_ids.json \ - | jq -r .${{ github.actor }})" - curl -fLSs -X PUT "https://app.asana.com/api/1.0/tasks/${asana_task_id}" \ -H "Authorization: Bearer ${{ env.ASANA_ACCESS_TOKEN }}" \ -H "Content-Type: application/json" \ --output /dev/null \ - -d "{ \"data\": { \"assignee\": \"$assignee_id\" }}" + -d "{ \"data\": { \"assignee\": \"$ASSIGNEE_ID\" }}" - name: Update Asana tasks for the release env: diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml index ecf9e416b1..63ab21b205 100644 --- a/.github/workflows/publish_dmg_release.yml +++ b/.github/workflows/publish_dmg_release.yml @@ -125,8 +125,8 @@ jobs: curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}?opt_fields=notes" \ -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \ | jq -r .data.notes \ - | ./scripts/extract_release_notes.sh) > release_notes.txt - release_notes="$( release_notes.txt + release_notes="$(" ]]; then echo "::error::Release notes are empty. Please add release notes to the Asana task and restart the workflow." exit 1