diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index 49894dd..059ed8c 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.17.2-dev +# devctl@6.17.1 # name: 'Values and schema' on: diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index 9e09d06..4e5d7d9 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.17.2-dev +# devctl@6.17.1 # name: Create Release on: @@ -102,12 +102,6 @@ jobs: download_url: "https://github.com/fsaintjacques/${binary}-tool/archive/${version}.tar.gz" tarball_binary_path: "*/src/${binary}" smoke_test: "${binary} --version" - - name: Generate a token - id: generate_token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.HERALD_APP_ID }} - private-key: ${{ secrets.HERALD_APP_KEY }} - name: Checkout code uses: actions/checkout@v4 - name: Update project.go @@ -128,8 +122,8 @@ jobs: fi - name: Set up git identity run: | - git config --local user.email "149080493+heraldbot[bot]@users.noreply.github.com" - git config --local user.name "HeraldBot[bot]" + git config --local user.email "dev@giantswarm.io" + git config --local user.name "taylorbot" - name: Commit changes run: | file="${{ needs.gather_facts.outputs.project_go_path }}" @@ -137,13 +131,13 @@ jobs: git commit -m "Bump version to ${{ steps.update_project_go.outputs.new_version }}" - name: Push changes env: - REMOTE_REPO: "https://${{ github.actor }}:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git" + REMOTE_REPO: "https://${{ github.actor }}:${{ secrets.TAYLORBOT_GITHUB_ACTION }}@github.com/${{ github.repository }}.git" branch: "${{ github.ref }}-version-bump" run: | git push "${REMOTE_REPO}" HEAD:${{ env.branch }} - name: Create PR env: - GITHUB_TOKEN: "${{ steps.generate_token.outputs.token }}" + GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" base: "${{ github.ref }}" branch: "${{ github.ref }}-version-bump" version: "${{ needs.gather_facts.outputs.version }}" @@ -159,17 +153,9 @@ jobs: outputs: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} steps: - - name: Generate a token - id: generate_token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.HERALD_APP_ID }} - private-key: ${{ secrets.HERALD_APP_KEY }} - name: Checkout code uses: actions/checkout@v4 with: - token: ${{ steps.generate_token.outputs.token }} - persist-credentials: false ref: ${{ github.sha }} - name: Ensure correct version in project.go if: ${{ needs.gather_facts.outputs.project_go_path != '' && needs.gather_facts.outputs.ref_version != 'true' }} @@ -185,22 +171,22 @@ jobs: path: ./CHANGELOG.md - name: Set up git identity run: | - git config --local user.email "149080493+heraldbot[bot]@users.noreply.github.com" - git config --local user.name "HeraldBot[bot]" + git config --local user.email "dev@giantswarm.io" + git config --local user.name "taylorbot" - name: Create tag run: | version="${{ needs.gather_facts.outputs.version }}" git tag "v$version" ${{ github.sha }} - name: Push tag env: - REMOTE_REPO: "https://${{ github.actor }}:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git" + REMOTE_REPO: "https://${{ github.actor }}:${{ secrets.TAYLORBOT_GITHUB_ACTION }}@github.com/${{ github.repository }}.git" run: | git push "${REMOTE_REPO}" --tags - name: Create release id: create_gh_release uses: ncipollo/release-action@v1 env: - GITHUB_TOKEN: "${{ steps.generate_token.outputs.token }}" + GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" with: body: ${{ steps.changelog_reader.outputs.changes }} tag: "v${{ needs.gather_facts.outputs.version }}" diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index ef00da0..4c3edcd 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.17.2-dev +# devctl@6.17.1 # name: Create Release PR on: @@ -48,18 +48,6 @@ jobs: skip: ${{ steps.pr_exists.outputs.skip }} version: ${{ steps.gather_facts.outputs.version }} steps: - - name: Generate a token - id: generate_token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.HERALD_APP_ID }} - private-key: ${{ secrets.HERALD_APP_KEY }} - - name: Checkout code - uses: actions/checkout@v4 - with: - token: ${{ steps.generate_token.outputs.token }} - persist-credentials: false - ref: ${{ needs.gather_facts.outputs.branch }} - name: Gather facts id: gather_facts run: | @@ -77,7 +65,7 @@ jobs: version="$(echo $head | awk -F# '{print $NF}')" if [[ $version =~ ^major|minor|patch$ ]]; then - gh auth login --with-token <<<$(echo -n ${{ steps.generate_token.outputs.token }}) + gh auth login --with-token <<<$(echo -n ${{ secrets.TAYLORBOT_GITHUB_ACTION }}) gh_api_get_latest_release_version() { if ! version="$(gh api "repos/$1/releases/latest" --jq '.tag_name[1:] | split(".") | .[0], .[1], .[2]')" @@ -136,13 +124,12 @@ jobs: - name: Check if PR exists id: pr_exists env: - GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} + GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" run: | head="${{ steps.gather_facts.outputs.branch }}" branch="${head#refs/heads/}" # Strip "refs/heads/" prefix. - - if gh pr list --head "${branch}" --json state --jq '.[].state' | grep -i 'open' > /dev/null; then - gh pr list --head "${branch}" + 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 @@ -164,17 +151,9 @@ jobs: with: binary: "architect" version: "6.11.0" - - name: Generate a token - id: generate_token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.HERALD_APP_ID }} - private-key: ${{ secrets.HERALD_APP_KEY }} - name: Checkout code uses: actions/checkout@v4 with: - token: ${{ steps.generate_token.outputs.token }} - persist-credentials: false ref: ${{ needs.gather_facts.outputs.branch }} - name: Prepare release changes run: | @@ -229,8 +208,8 @@ jobs: fi - name: Set up git identity run: | - git config --local user.email "149080493+heraldbot[bot]@users.noreply.github.com" - git config --local user.name "HeraldBot[bot]" + git config --local user.email "dev@giantswarm.io" + git config --local user.name "taylorbot" - name: Create release commit env: version: "${{ needs.gather_facts.outputs.version }}" @@ -239,12 +218,12 @@ jobs: git commit -m "Release v${{ env.version }}" - name: Push changes env: - remote_repo: "https://${{ github.actor }}:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git" + remote_repo: "https://${{ github.actor }}:${{ secrets.TAYLORBOT_GITHUB_ACTION }}@github.com/${{ github.repository }}.git" run: | git push "${remote_repo}" HEAD:${{ needs.gather_facts.outputs.branch }} - name: Create PR env: - GITHUB_TOKEN: "${{ steps.generate_token.outputs.token }}" + GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" base: "${{ needs.gather_facts.outputs.base }}" version: "${{ needs.gather_facts.outputs.version }}" run: | diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 30a9de8..b02c5ff 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.17.2-dev +# devctl@6.17.1 # name: gitleaks diff --git a/Makefile b/Makefile index 12da55a..06ed529 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.15.1 +# devctl@6.17.1 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 3e8f4b5..9fc6224 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.15.1 +# devctl@6.17.1 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index 82089da..a3abed6 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.15.1 +# devctl@6.17.1 # APPLICATION := $(shell go list -m | cut -d '/' -f 3)