diff --git a/.github/workflows/upload-s3.yml b/.github/workflows/upload-s3.yml index 33ed6b509..e460e9dec 100644 --- a/.github/workflows/upload-s3.yml +++ b/.github/workflows/upload-s3.yml @@ -4,9 +4,14 @@ on: workflows: [CI] types: - completed +permissions: + pull-requests: write jobs: - download: + upload-s3: runs-on: ubuntu-latest + if: >- + github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' steps: - name: Find associated pull request id: pr @@ -26,7 +31,7 @@ jobs: console.info("Pull request number is", pullRequestNumber) return pullRequestNumber - name: 'Download artifact' - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ @@ -55,7 +60,14 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: us-east-1 - name: Comment on PR - run: 'gh pr comment --edit-last https://github.com/$GITHUB_REPOSITORY/pull/$GITHUB_PR --body "Try the dev build for this PR: https://acquia-cli.s3.amazonaws.com/builds/$GITHUB_SHA/acli.phar"' + run: | + GITHUB_PR=${{ steps.pr.outputs.result }} + COMMENT="Try the dev build for this PR: https://acquia-cli.s3.amazonaws.com/build/$GITHUB_SHA/acli.phar + \`\`\` + curl -OL https://acquia-cli.s3.amazonaws.com/build/$GITHUB_SHA/acli.phar + chmod +x acli.phar + \`\`\`" + COMMENT_URL="https://github.com/$GITHUB_REPOSITORY/pull/$GITHUB_PR" + gh pr comment --edit-last $COMMENT_URL --body "$COMMENT" || gh pr comment $COMMENT_URL --body "$COMMENT" env: GH_TOKEN: ${{ github.token }} - GITHUB_PR: ${{ steps.pr.outputs.result }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 507423da9..d31b2a302 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,10 +43,11 @@ Pull requests must also adhere to the following guidelines: Every commit on the Acquia CLI repository, including for pull requests, automatically builds and uploads acli.phar as a build artifact to assist with reviews. To download acli.phar for any commit: -1. Wait for the CI workflow to complete. -2. On the workflow summary page, in the "Artifacts" section, click on `acli.phar`. -3. Unzip the downloaded file. -4. Make the file executable: `chmod +x acli.phar` +1. For pull requests, GitHub Actions will comment on the PR with a link to the dev build. +2. For any other commit, wait for the CI workflow to complete. +3. On the workflow summary page, in the "Artifacts" section, click on `acli.phar`. +4. Unzip the downloaded file. +5. Make the file executable: `chmod +x acli.phar` ## Building and testing