From 2fd58da7a4ef2ded42c8194df07daec95448a063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 08:42:08 +0000 Subject: [PATCH 1/2] GH Actions: Bump peter-evans/create-pull-request from 6 to 7 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/update-cacert.yml | 2 +- .github/workflows/update-website.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-cacert.yml b/.github/workflows/update-cacert.yml index 49b1aef50..2c878b3d8 100644 --- a/.github/workflows/update-cacert.yml +++ b/.github/workflows/update-cacert.yml @@ -86,7 +86,7 @@ jobs: run: echo "DATE=$(/bin/date -u "+%F")" >> $GITHUB_OUTPUT - name: Create pull request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: base: ${{ steps.branches.outputs.BASE }} branch: ${{ steps.branches.outputs.PR_BRANCH }} diff --git a/.github/workflows/update-website.yml b/.github/workflows/update-website.yml index 236bf3776..75835cac1 100644 --- a/.github/workflows/update-website.yml +++ b/.github/workflows/update-website.yml @@ -165,7 +165,7 @@ jobs: run: git status -vv --untracked=all - name: Create pull request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: base: gh-pages branch: feature/auto-ghpages-update-${{ steps.get_pr_info.outputs.REF }} From a6657d8551d9d0e5579ed454baf02c5821225de7 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 9 Sep 2024 18:03:46 +0200 Subject: [PATCH 2/2] GH Actions: update for new version of "Create Pull Request" The "Create Pull Request" action has released a new major version. I have verified that the workflows as they were would still work. However, this new version also offers two relevant new features: * Signing commits. The PRs created by this actions are created by the `github-actions[bot]` user. Adding the `sign-commits: true` option will allow the bot to sign the commits based on the repo default `GITHUB_TOKEN`. * Setting `draft` to `always-true`. When changes are made to the "update website" workflow, a draft PR is opened to verify those changes don't negatively impact the workflow. This draft PR should never be merged, it is only for verification. Setting the `draft` option to `always-true` not just opens the PR as draft, but will ensure it will stay in draft if the PR would be updated (via the action). Refs: * https://github.com/peter-evans/create-pull-request/releases/tag/v7.0.0 * https://github.com/peter-evans/create-pull-request/blob/v7.0.0/docs/concepts-guidelines.md#commit-signature-verification-for-bots --- .github/workflows/update-cacert.yml | 1 + .github/workflows/update-website.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-cacert.yml b/.github/workflows/update-cacert.yml index 2c878b3d8..d7f1c85f0 100644 --- a/.github/workflows/update-cacert.yml +++ b/.github/workflows/update-cacert.yml @@ -91,6 +91,7 @@ jobs: base: ${{ steps.branches.outputs.BASE }} branch: ${{ steps.branches.outputs.PR_BRANCH }} delete-branch: true + sign-commits: true commit-message: ":lock_with_ink_pen: Update certificate bundle" title: ":lock_with_ink_pen: Update certificate bundle" body: | diff --git a/.github/workflows/update-website.yml b/.github/workflows/update-website.yml index 75835cac1..ca689e998 100644 --- a/.github/workflows/update-website.yml +++ b/.github/workflows/update-website.yml @@ -104,7 +104,7 @@ jobs: echo "REF=$REF_NAME" >> $GITHUB_OUTPUT echo 'PR_TITLE_PREFIX=[TEST | DO NOT MERGE] ' >> $GITHUB_OUTPUT echo 'PR_BODY=Test run for the website update after changes to the automated scripts.' >> $GITHUB_OUTPUT - echo 'DRAFT=true' >> $GITHUB_OUTPUT + echo 'DRAFT=always-true' >> $GITHUB_OUTPUT else echo "REF=$TAG_NAME" >> $GITHUB_OUTPUT echo 'PR_TITLE_PREFIX=' >> $GITHUB_OUTPUT @@ -170,6 +170,7 @@ jobs: base: gh-pages branch: feature/auto-ghpages-update-${{ steps.get_pr_info.outputs.REF }} delete-branch: true + sign-commits: true commit-message: "GH Pages: update other docs for Requests ${{ steps.get_pr_info.outputs.REF }}" title: "${{ steps.get_pr_info.outputs.PR_TITLE_PREFIX }}:books: Update GHPages website" body: |