From ec0a546bdc8172365ad82de674515075db7dec85 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Feb 2024 08:42:15 +0000 Subject: [PATCH] Align files --- .github/workflows/zz_generated.create_release.yaml | 11 ++++++++++- .github/workflows/zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 2 +- .../workflows/zz_generated.run_ossf_scorecard.yaml | 2 +- .github/zz_generated.windows-code-signing.sh | 2 +- Makefile | 2 +- Makefile.gen.go.mk | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index 0462d2bb..a0072ad3 100644 --- a/.github/workflows/zz_generated.create_release.yaml +++ b/.github/workflows/zz_generated.create_release.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # name: Create Release on: @@ -142,6 +142,15 @@ jobs: title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}" run: | gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }} + - name: Enable auto-merge for PR + env: + GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" + base: "${{ github.ref }}" + branch: "${{ github.ref }}-version-bump" + version: "${{ needs.gather_facts.outputs.version }}" + title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}" + run: | + gh pr merge --auto --squash "${{ env.branch }}" || echo "::warning::Auto-merge not allowed. Please adjust the repository settings." create_release: name: Create release runs-on: ubuntu-22.04 diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index 24a6a319..3147c17b 100644 --- a/.github/workflows/zz_generated.create_release_pr.yaml +++ b/.github/workflows/zz_generated.create_release_pr.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # name: Create Release PR on: diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 95c751a4..52e93e84 100644 --- a/.github/workflows/zz_generated.gitleaks.yaml +++ b/.github/workflows/zz_generated.gitleaks.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # name: gitleaks diff --git a/.github/workflows/zz_generated.run_ossf_scorecard.yaml b/.github/workflows/zz_generated.run_ossf_scorecard.yaml index 8be5ee45..804d2ac2 100644 --- a/.github/workflows/zz_generated.run_ossf_scorecard.yaml +++ b/.github/workflows/zz_generated.run_ossf_scorecard.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # # This workflow uses actions that are not certified by GitHub. They are provided diff --git a/.github/zz_generated.windows-code-signing.sh b/.github/zz_generated.windows-code-signing.sh index 322d22c9..ce1ad029 100644 --- a/.github/zz_generated.windows-code-signing.sh +++ b/.github/zz_generated.windows-code-signing.sh @@ -2,7 +2,7 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # APPLICATION=$1 diff --git a/Makefile b/Makefile index 7f6138b6..793069aa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # include Makefile.*.mk diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index b75baf62..ce424220 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.2 +# devctl@6.20.0 # PACKAGE_DIR := ./bin-dist