From 33b4c2685b7185a98d1f919c82b71895d30f443d Mon Sep 17 00:00:00 2001 From: Matias Charriere Date: Thu, 5 Oct 2023 12:32:38 +0200 Subject: [PATCH 1/2] Replace `hub` CLI with the official `gh` tool. `hub` has been removed from the runner-images https://github.com/actions/runner-images/issues/8362 Signed-off-by: Matias Charriere --- .../workflows/internal/file/create_release.yaml.template | 2 +- .../internal/file/create_release_pr.yaml.template | 2 +- .../workflows/internal/file/update_chart.yaml.template | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/gen/input/workflows/internal/file/create_release.yaml.template b/pkg/gen/input/workflows/internal/file/create_release.yaml.template index 40732e24..dafde71b 100644 --- a/pkg/gen/input/workflows/internal/file/create_release.yaml.template +++ b/pkg/gen/input/workflows/internal/file/create_release.yaml.template @@ -137,7 +137,7 @@ jobs: version: "${{ needs.gather_facts.outputs.version }}" title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}" run: | - hub pull-request -f -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }} + gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }} create_release: name: Create release runs-on: ubuntu-22.04 diff --git a/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template b/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template index ce6ecb31..69fbab1f 100644 --- a/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template +++ b/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template @@ -221,4 +221,4 @@ jobs: base: "${{ needs.gather_facts.outputs.base }}" version: "${{ needs.gather_facts.outputs.version }}" run: | - hub pull-request -f -m "Release v${{ env.version }}" -a ${{ github.actor }} -b ${{ env.base }} -h ${{ needs.gather_facts.outputs.branch }} + gh pr create --assignee ${{ github.actor }} --title "Release v${{ env.version }}" --body "" --base ${{ env.base }} --head "${{ needs.gather_facts.outputs.branch }}" diff --git a/pkg/gen/input/workflows/internal/file/update_chart.yaml.template b/pkg/gen/input/workflows/internal/file/update_chart.yaml.template index c8b5f7b2..2aa1af35 100644 --- a/pkg/gen/input/workflows/internal/file/update_chart.yaml.template +++ b/pkg/gen/input/workflows/internal/file/update_chart.yaml.template @@ -122,4 +122,9 @@ jobs: GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}" base: "${{ needs.gather_facts.outputs.base }}" run: | - 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 }} + gh pr create --title "Automated update from upstream" --label "automated-update" --assignee ${{ github.actor }} --base ${{ env.base }} --head ${{ needs.gather_facts.outputs.branch }} --body-file - << EOF + This PR was created by the \`update-chart\` GitHub Actions workflow. + - [ ] **:warning: All tests are passing** + - [ ] **:warning: The CHANGELOG.md file has been updated** + - [ ] **:warning: Additional changes in ignored files (see vendir.yml) have been adapted and migrated** + EOF From 99633c71dff78bb7240a24072b60036865a20e02 Mon Sep 17 00:00:00 2001 From: Matias Charriere Date: Thu, 5 Oct 2023 12:33:55 +0200 Subject: [PATCH 2/2] update changelog Signed-off-by: Matias Charriere --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5a8798b..80a80167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Replaced `hub` with `gh` in CI templates. + ### Fixed - Fixed inconsistent logging in `devctl repo setup renovate`.