diff --git a/.github/workflows/hpcbp-event-pr.yml b/.github/workflows/hpcbp-event-pr.yml index 99690a8..0b105cd 100644 --- a/.github/workflows/hpcbp-event-pr.yml +++ b/.github/workflows/hpcbp-event-pr.yml @@ -25,12 +25,12 @@ jobs: uses: carlosperate/download-file-action@v2 with: file-url: https://raw.githubusercontent.com/ideas-productivity/ideas-productivity.github.io/refs/heads/main/_events/hpcbp-webinars/${{ inputs.event-file }}.md - location: 'Events' + location: '_events/hpcbp-webinars' file-name: ${{ inputs.event-file }}.md # - name: Check the file is there # run: | - # ls -l Events/${{ inputs.event-file }}.md || : + # ls -l _events/hpcbp-webinars/${{ inputs.event-file }}.md || : - name: Create pull request id: cpr @@ -40,8 +40,8 @@ jobs: branch: ${{ github.actor }}-hpcbp-new-event branch-suffix: timestamp assignees: ${{ github.actor }} - commit-message: "Adding new HPC-BP webinar event from the ideas-productivity.org website" - body: "Adding new HPC-BP webinar event from the ideas-productivity.org website" + commit-message: "Adding or updating HPC-BP webinar event from the ideas-productivity.org website" + body: "Adding or updating HPC-BP webinar event from the ideas-productivity.org website" labels: | content: event @@ -51,10 +51,12 @@ jobs: echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" - - name: Merge PR - if: ${{ steps.cpr.outputs.pull-request-number }} - env: - GH_TOKEN: ${{ secrets.PR_MERGE_PAT }} - run: | - gh pr merge ${{ steps.cpr.outputs.pull-request-number }} --merge --auto --body "Automatically merging script-generated event" + # Hold off on the auto-merge until we're confident that the rest is working properly + # NOTE: requires special privs to merge PRs (expecting a "PR_MERGE_PAT" secret) + # - name: Merge PR + # if: ${{ steps.cpr.outputs.pull-request-number }} + # env: + # GH_TOKEN: ${{ secrets.PR_MERGE_PAT }} + # run: | + # gh pr merge ${{ steps.cpr.outputs.pull-request-number }} --merge --auto --body "Automatically merging script-generated event" \ No newline at end of file