diff --git a/.github/actions/asana-create-action-item/action.yml b/.github/actions/asana-create-action-item/action.yml index cd2ea0355d..150e7f52ae 100644 --- a/.github/actions/asana-create-action-item/action.yml +++ b/.github/actions/asana-create-action-item/action.yml @@ -71,7 +71,7 @@ runs: if: ${{ inputs.notes }} shell: bash env: - ASSIGNEE_ID: ${{ steps.get-automation-subtask.outputs.assignee-id }} + ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }} AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }} NOTES: ${{ inputs.notes }} TASK_NAME: ${{ inputs.task-name }} @@ -84,7 +84,7 @@ runs: if: ${{ inputs.html-notes }} shell: bash env: - ASSIGNEE_ID: ${{ steps.get-automation-subtask.outputs.assignee-id }} + ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }} AUTOMATION_TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }} HTML_NOTES: ${{ inputs.html-notes }} TASK_NAME: ${{ inputs.task-name }} @@ -97,7 +97,7 @@ runs: shell: bash env: ASANA_ACCESS_TOKEN: ${{ inputs.access-token }} - ASSIGNEE_ID: ${{ steps.get-automation-subtask.outputs.assignee-id }} + ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }} TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }} PAYLOAD_BASE64: ${{ steps.process-template-payload.outputs.payload-base64 || steps.process-notes-payload.outputs.payload-base64 || steps.process-html-notes-payload.outputs.payload-base64 }} run: | diff --git a/.github/actions/asana-get-release-automation-subtask-id/action.yml b/.github/actions/asana-get-release-automation-subtask-id/action.yml index f692570445..a7721a7043 100644 --- a/.github/actions/asana-get-release-automation-subtask-id/action.yml +++ b/.github/actions/asana-get-release-automation-subtask-id/action.yml @@ -13,9 +13,6 @@ outputs: automation-task-id: description: "Automation task ID" value: ${{ steps.extract-automation-task-id.outputs.automation-task-id }} - assignee-id: - description: "Release task assignee ID" - value: ${{ steps.extract-assignee-id.outputs.assignee-id }} runs: using: "composite" steps: @@ -25,12 +22,6 @@ runs: task-url: ${{ inputs.task-url }} access-token: ${{ inputs.access-token }} - - id: extract-assignee-id - uses: ./.github/actions/asana-extract-task-assignee - with: - task-id: ${{ steps.extract-task-id.outputs.task-id }} - access-token: ${{ inputs.access-token }} - - id: extract-automation-task-id run: | task_id="${{ steps.extract-task-id.outputs.task-id }}" diff --git a/.github/actions/asana-log-message/action.yml b/.github/actions/asana-log-message/action.yml index 60f7af634e..c95558fc3f 100644 --- a/.github/actions/asana-log-message/action.yml +++ b/.github/actions/asana-log-message/action.yml @@ -29,11 +29,17 @@ runs: access-token: ${{ inputs.access-token }} task-url: ${{ inputs.task-url }} + - id: get-asana-user-id + uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main + with: + access-token: ${{ inputs.access-token }} + github-handle: ${{ github.actor }} + - id: add-colaborator shell: bash env: ASANA_ACCESS_TOKEN: ${{ inputs.access-token }} - ASSIGNEE_ID: ${{ steps.get-automation-subtask.outputs.assignee-id }} + ASSIGNEE_ID: ${{ steps.get-asana-user-id.outputs.user-id }} TASK_ID: ${{ steps.get-automation-subtask.outputs.automation-task-id }} run: | return_code=$(curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}/addFollowers" \