diff --git a/.github/workflows/handle-appeal.yml b/.github/workflows/handle-appeal.yml index 2a5a4f8..e3180a0 100644 --- a/.github/workflows/handle-appeal.yml +++ b/.github/workflows/handle-appeal.yml @@ -33,7 +33,7 @@ jobs: uses: actions/github-script@v7 with: script: | - const username = '${{ steps.parse.outputs.username }}'.toLowerCase(); + const username = '${{ steps.parse.outputs.issueparser_username }}'.toLowerCase(); const { data: issues } = await github.rest.issues.listForRepo({ owner: context.repo.owner, repo: context.repo.repo, @@ -73,7 +73,7 @@ jobs: if: steps.dupes.outputs.has_duplicate != 'true' id: validate env: - USERNAME: ${{ steps.parse.outputs.username }} + USERNAME: ${{ steps.parse.outputs.issueparser_username }} ISSUE_AUTHOR: ${{ github.event.issue.user.login }} ACTION: validate run: bash scripts/handle-appeal.sh @@ -168,7 +168,7 @@ jobs: - name: Approve appeal env: - USERNAME: ${{ steps.parse.outputs.username }} + USERNAME: ${{ steps.parse.outputs.issueparser_username }} ACTION: approve run: bash scripts/handle-appeal.sh @@ -177,7 +177,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add data/accounts/ - git commit -m "Appeal approved: clear ${{ steps.parse.outputs.username }} (via #${{ github.event.issue.number }})" + git commit -m "Appeal approved: clear ${{ steps.parse.outputs.issueparser_username }} (via #${{ github.event.issue.number }})" git push - name: Comment and close @@ -188,7 +188,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, - body: '**Appeal approved.** Account `${{ steps.parse.outputs.username }}` has been cleared.' + body: '**Appeal approved.** Account `${{ steps.parse.outputs.issueparser_username }}` has been cleared.' }); await github.rest.issues.update({ owner: context.repo.owner, @@ -215,7 +215,7 @@ jobs: - name: Deny appeal env: - USERNAME: ${{ steps.parse.outputs.username }} + USERNAME: ${{ steps.parse.outputs.issueparser_username }} ACTION: deny run: bash scripts/handle-appeal.sh @@ -224,7 +224,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add data/accounts/ - git commit -m "Appeal denied: ${{ steps.parse.outputs.username }} remains flagged (via #${{ github.event.issue.number }})" + git commit -m "Appeal denied: ${{ steps.parse.outputs.issueparser_username }} remains flagged (via #${{ github.event.issue.number }})" git push - name: Comment and close @@ -235,7 +235,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, - body: '**Appeal denied.** Account `${{ steps.parse.outputs.username }}` remains flagged.' + body: '**Appeal denied.** Account `${{ steps.parse.outputs.issueparser_username }}` remains flagged.' }); await github.rest.issues.update({ owner: context.repo.owner, diff --git a/.github/workflows/process-application.yml b/.github/workflows/process-application.yml index 1ddfbc8..1eff253 100644 --- a/.github/workflows/process-application.yml +++ b/.github/workflows/process-application.yml @@ -31,8 +31,8 @@ jobs: - name: Validate application id: validate env: - REPOSITORY: ${{ steps.parse.outputs.repository }} - MAINTAINER: ${{ steps.parse.outputs.maintainer }} + REPOSITORY: ${{ steps.parse.outputs.issueparser_repository }} + MAINTAINER: ${{ steps.parse.outputs.issueparser_maintainer }} ISSUE_AUTHOR: ${{ github.event.issue.user.login }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: bash scripts/process-application.sh @@ -127,8 +127,8 @@ jobs: - name: Add to trusted repos env: - REPOSITORY: ${{ steps.parse.outputs.repository }} - MAINTAINER: ${{ steps.parse.outputs.maintainer }} + REPOSITORY: ${{ steps.parse.outputs.issueparser_repository }} + MAINTAINER: ${{ steps.parse.outputs.issueparser_maintainer }} ISSUE_AUTHOR: ${{ github.event.issue.user.login }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: bash scripts/process-application.sh @@ -138,7 +138,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add data/trusted-repos.json - git commit -m "Add ${{ steps.parse.outputs.repository }} to trusted network (via #${{ github.event.issue.number }})" + git commit -m "Add ${{ steps.parse.outputs.issueparser_repository }} to trusted network (via #${{ github.event.issue.number }})" git push - name: Comment and close @@ -149,7 +149,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, - body: '**Application approved!** Repository `${{ steps.parse.outputs.repository }}` has been added to the trusted reporter network.\n\nYou can now use the areyouabot action to submit reports.' + body: '**Application approved!** Repository `${{ steps.parse.outputs.issueparser_repository }}` has been added to the trusted reporter network.\n\nYou can now use the areyouabot action to submit reports.' }); await github.rest.issues.update({ owner: context.repo.owner, diff --git a/.github/workflows/process-report.yml b/.github/workflows/process-report.yml index 451fbf1..a65dc38 100644 --- a/.github/workflows/process-report.yml +++ b/.github/workflows/process-report.yml @@ -29,10 +29,10 @@ jobs: - name: Process report id: report env: - USERNAME: ${{ steps.parse.outputs.username }} - REPORTING_REPO: ${{ steps.parse.outputs.reporting_repo }} - REASON: ${{ steps.parse.outputs.reason }} - EVIDENCE_URL: ${{ steps.parse.outputs.evidence_url }} + USERNAME: ${{ steps.parse.outputs.issueparser_username }} + REPORTING_REPO: ${{ steps.parse.outputs.issueparser_reporting_repo }} + REASON: ${{ steps.parse.outputs.issueparser_reason }} + EVIDENCE_URL: ${{ steps.parse.outputs.issueparser_evidence_url }} ISSUE_NUMBER: ${{ github.event.issue.number }} run: bash scripts/process-report.sh @@ -42,7 +42,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add data/accounts/ - git commit -m "Report: flag ${{ steps.parse.outputs.username }} (via #${{ github.event.issue.number }})" + git commit -m "Report: flag ${{ steps.parse.outputs.issueparser_username }} (via #${{ github.event.issue.number }})" git push - name: Comment and close (success) @@ -50,7 +50,7 @@ jobs: uses: actions/github-script@v7 with: script: | - const username = '${{ steps.parse.outputs.username }}'.toLowerCase(); + const username = '${{ steps.parse.outputs.issueparser_username }}'.toLowerCase(); await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, @@ -73,7 +73,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, - body: `**Report rejected.** Repository \`${{ steps.parse.outputs.reporting_repo }}\` is not in the trusted reporter network.\n\nTo join, open an application issue.` + body: `**Report rejected.** Repository \`${{ steps.parse.outputs.issueparser_reporting_repo }}\` is not in the trusted reporter network.\n\nTo join, open an application issue.` }); await github.rest.issues.update({ owner: context.repo.owner,