diff --git a/.github/workflows/dashboards-issue-add-label.yml b/.github/workflows/dashboards-issue-add-label.yml index 95abce4355b..c3157a05afb 100644 --- a/.github/workflows/dashboards-issue-add-label.yml +++ b/.github/workflows/dashboards-issue-add-label.yml @@ -38,11 +38,13 @@ jobs: - name: Check if issue is in target project env: GH_TOKEN: ${{ steps.generate_token.outputs.token }} + ISSUE_NUMBER: ${{ github.event.issue.number }} + TARGET_PROJECT: ${{ env.TARGET_PROJECT }} run: | gh api graphql -f query=' query($org: String!, $repo: String!) { repository(name: $repo, owner: $org) { - issue (number: ${{ github.event.issue.number }}) { + issue (number: $ISSUE_NUMBER) { id projectItems(first:20) { nodes { @@ -55,12 +57,14 @@ jobs: } }' -f org=$ORGANIZATION -f repo=$REPO > projects_data.json - echo 'IN_TARGET_PROJ='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.TARGET_PROJECT }}) | .project != null' projects_data.json) >> $GITHUB_ENV + echo 'IN_TARGET_PROJ='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number=='"$TARGET_PROJECT"') | .project != null' projects_data.json) >> $GITHUB_ENV echo 'ITEM_ID='$(jq '.data.repository.issue.id' projects_data.json) >> $GITHUB_ENV - name: Set up label array if: env.IN_TARGET_PROJ + env: + LABEL_IDS: ${{ env.LABEL_IDS }} run: | - IFS=',' read -ra LABEL_IDs <<< "${{ env.LABEL_IDs }}" + IFS=',' read -ra LABEL_IDs <<< "$LABEL_IDS" for item in "${LABEL_IDs[@]}"; do echo "Item: $item" done @@ -68,6 +72,7 @@ jobs: if: env.IN_TARGET_PROJ env: GH_TOKEN: ${{ steps.generate_token.outputs.token }} + LABEL_IDS: ${{ env.LABEL_IDS }} run: | gh api graphql -f query=' mutation ($labelableId: ID!, $labelIds: [ID!]!) { @@ -76,4 +81,4 @@ jobs: ) { clientMutationId } - }' -f labelableId=$ITEM_ID -f labelIds=${{ env.LABEL_IDs }} + }' -f labelableId=$ITEM_ID -f labelIds=$LABEL_IDS diff --git a/.github/workflows/skye-add-to-project.yml b/.github/workflows/skye-add-to-project.yml index 5e8ccc8e557..6788db2d95e 100644 --- a/.github/workflows/skye-add-to-project.yml +++ b/.github/workflows/skye-add-to-project.yml @@ -50,10 +50,12 @@ jobs: # Check if the user is in the list from the secret - name: Check if user is allowed id: check_user + env: + ALLOWED_USERS: ${{ env.ALLOWED_USERS }} + USERNAME: ${{ github.event.sender.login }} run: | # Convert the comma-separated list to an array - IFS=',' read -ra ALLOWED_USERS <<< "${{ env.ALLOWED_USERS }}" - USERNAME="${{ github.event.sender.login }}" + IFS=',' read -ra ALLOWED_USERS <<< "$ALLOWED_USERS" # Check if user is in the allowed list for allowed_user in "${ALLOWED_USERS[@]}"; do