From 96b9340fe65fd042ec20cfb9584fb9ebf13db9f7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Jul 2023 08:17:32 +0000 Subject: [PATCH] Align files --- .circleci/config.yml | 2 +- .github/dependabot.yml | 2 +- .../workflows/zz_generated.check_values_schema.yaml | 2 +- .github/workflows/zz_generated.create_release.yaml | 2 +- .../workflows/zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 2 +- .github/workflows/zz_generated.update_chart.yaml | 12 +++++++----- Makefile | 2 +- Makefile.gen.app.mk | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a1003b..6198694 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - architect: giantswarm/architect@4.29.0 + architect: giantswarm/architect@4.30.1 workflows: package-and-push-chart-on-tag: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 40f29e1..74617da 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.4.0 +# devctl@6.5.0 # version: 2 updates: diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index 6ad46d2..436f44c 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.4.0 +# devctl@6.5.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 8dba873..5c3f8e9 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.4.0 +# devctl@6.5.0 # name: Create Release on: diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index db355fe..207cea0 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.4.0 +# devctl@6.5.0 # name: Create Release PR on: diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 339c69e..85cb328 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.4.0 +# devctl@6.5.0 # name: gitleaks diff --git a/.github/workflows/zz_generated.update_chart.yaml b/.github/workflows/zz_generated.update_chart.yaml index c97816c..5b0db72 100644 --- a/.github/workflows/zz_generated.update_chart.yaml +++ b/.github/workflows/zz_generated.update_chart.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.4.0 +# devctl@6.5.0 # # @@ -62,8 +62,10 @@ jobs: env: GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" run: | - if gh pr view --repo ${{ github.repository }} ${{ steps.gather_facts.outputs.head }} | grep -i 'state:[[:space:]]*open' >/dev/null; then - gh pr view --repo ${{ github.repository }} ${{ steps.gather_facts.outputs.head }} + head="${{ steps.gather_facts.outputs.branch }}" + branch="${head#refs/heads/}" # Strip "refs/heads/" prefix. + if gh pr view --repo "${{ github.repository }}" "${branch}" --json state --jq .state | grep -i 'open' > /dev/null; then + gh pr view --repo "${{ github.repository }}" "${branch}" echo "skip=true" >> $GITHUB_OUTPUT else echo "skip=false" >> $GITHUB_OUTPUT @@ -115,7 +117,7 @@ jobs: - name: Create update commit run: | git add -A - git commit -m "Sync chart with upstream." + git commit -m "Automated update from upstream" - name: Push changes env: remote_repo: "https://${{ github.actor }}:${{ secrets.TAYLORBOT_GITHUB_ACTION }}@github.com/${{ github.repository }}.git" @@ -126,4 +128,4 @@ jobs: GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" base: "${{ needs.gather_facts.outputs.base }}" run: | - hub pull-request -f -m "Update chart from upstream" -m "This PR was created by the \`update-chart\` automated workflow." -m "**:warning: Make sure all tests have passed before merging.**" -l "automated-update" -a ${{ github.actor }} -b ${{ env.base }} -h ${{ needs.gather_facts.outputs.branch }} + hub pull-request -f -m "Automated update from upstream" -m "This PR was created by the \`update-chart\` GitHub Actions workflow." -m "- [ ] **:warning: All tests are passing**" -m "- [ ] **:warning: The CHANGELOG.md file has been updated**" -m "- [ ] **:warning: Additional changes in ignored files (see vendir.yml) have been adapted and migrated**" -l "automated-update" -a ${{ github.actor }} -b ${{ env.base }} -h ${{ needs.gather_facts.outputs.branch }} diff --git a/Makefile b/Makefile index e0927e1..2c6db5b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.4.0 +# devctl@6.5.0 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index eb1fcf9..fbd0807 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.4.0 +# devctl@6.5.0 # ##@ App