From a06e1d6adbfb2010d9818bf75c41ea8a0b3b4d6a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Feb 2024 07:39:57 +0000 Subject: [PATCH] Align files --- .../workflows/zz_generated.check_values_schema.yaml | 2 +- .github/workflows/zz_generated.create_release.yaml | 13 +++++++++++-- .../workflows/zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 2 +- .../workflows/zz_generated.run_ossf_scorecard.yaml | 2 +- LICENSE | 2 +- Makefile | 2 +- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- 9 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index ea71062..4599451 100644 --- a/.github/workflows/zz_generated.check_values_schema.yaml +++ b/.github/workflows/zz_generated.check_values_schema.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.1 +# devctl@6.20.0 # name: 'Values and schema' on: diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index 3a2967a..e0cecf4 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.1 +# devctl@6.20.0 # name: Create Release on: @@ -91,7 +91,7 @@ jobs: uses: giantswarm/install-binary-action@v1.1.0 with: binary: "architect" - version: "6.13.0" + version: "6.14.1" - name: Install semver uses: giantswarm/install-binary-action@v1.1.0 with: @@ -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 aac944a..3147c17 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.1 +# 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 a53c0dd..52e93e8 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.1 +# 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 7088671..804d2ac 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.1 +# devctl@6.20.0 # # This workflow uses actions that are not certified by GitHub. They are provided diff --git a/LICENSE b/LICENSE index b7a4d40..93a6674 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 - 2023 Giant Swarm GmbH + Copyright 2016 - 2024 Giant Swarm GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 6a6e741..793069a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.1 +# devctl@6.20.0 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 0692bf9..264c647 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.1 +# devctl@6.20.0 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index fa2731b..60f2dfc 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.18.1 +# devctl@6.20.0 # APPLICATION := $(shell go list -m | cut -d '/' -f 3)