From e84d7e668da4c3f8ad3556b5368134c3a8f30d4f Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Thu, 23 May 2024 23:04:10 +0200 Subject: [PATCH 1/4] fix: create the PR according to our own standards (#34) # Description When we update the workflows with `update_workflows.sh` a PR is automatically created. But the description of it didn't follow our own template. This PR adds a multiline description with `Description` and `Verification` section. # Verification None. --- update-workflows.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/update-workflows.sh b/update-workflows.sh index 9d2f154..09e33c9 100755 --- a/update-workflows.sh +++ b/update-workflows.sh @@ -52,7 +52,18 @@ function create_commit_and_pr() { git commit -m "update workflows to latest version" git push --set-upstream origin update-workflows - gh pr create --title "ci: update workflows to latest version" --body "" --base main + body=$(cat <<-EOF + # Description + + This PR updates all workflows to the latest version. + + # Verification + + Done by the workflows in this feature branch, except for the release workflow. +EOF + ) + + gh pr create --title "ci: update workflows to latest version" --body "$body" --base main gh pr view --web } From f36da8a11a87988ff393cd9a65ef4a016bf4a9fb Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Thu, 23 May 2024 23:04:32 +0200 Subject: [PATCH 2/4] fix: find the nearest tag for workflow updates (#33) # Description The `head` of the default branch might not be tagged, i.e. `ci` commit, ... We now find the latest tag in the commit history to be able to create the comment when updating the workflows. # Verification Locally. --- update-workflows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-workflows.sh b/update-workflows.sh index 09e33c9..c3323ff 100755 --- a/update-workflows.sh +++ b/update-workflows.sh @@ -152,7 +152,7 @@ do # add a reference to this repository which holds the workflow commit_sha=$(git rev-parse HEAD) - tag=$(git describe --tags --exact-match 2>/dev/null || true) + tag=$(git describe --tags "$(git rev-list --tags --max-count=1)" || true) file_to_include="uses: Hapag-Lloyd/Workflow-Templates/.github/workflows/$base_name@$commit_sha # $tag" From bbc5d9accd5aaf46032784b0394791346f369b6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 13:46:04 +0200 Subject: [PATCH 3/4] ci(deps): update docker/login-action action to v3.2.0 (#35) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [docker/login-action](https://togithub.com/docker/login-action) | action | minor | `v3.1.0` -> `v3.2.0` | --- ### Release Notes
docker/login-action (docker/login-action) ### [`v3.2.0`](https://togithub.com/docker/login-action/releases/tag/v3.2.0) [Compare Source](https://togithub.com/docker/login-action/compare/v3.1.0...v3.2.0) - Improve missing username/password by [@​Frankkkkk](https://togithub.com/Frankkkkk) in [https://github.com/docker/login-action/pull/706](https://togithub.com/docker/login-action/pull/706) - Bump [@​docker/actions-toolkit](https://togithub.com/docker/actions-toolkit) from 0.18.0 to 0.24.0 in [https://github.com/docker/login-action/pull/715](https://togithub.com/docker/login-action/pull/715) [https://github.com/docker/login-action/pull/721](https://togithub.com/docker/login-action/pull/721) - Bump aws-sdk-dependencies to 3.583.0 in [https://github.com/docker/login-action/pull/720](https://togithub.com/docker/login-action/pull/720) - Bump undici from 5.28.3 to 5.28.4 in [https://github.com/docker/login-action/pull/694](https://togithub.com/docker/login-action/pull/694) **Full Changelog**: https://github.com/docker/login-action/compare/v3.1.0...v3.2.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Hapag-Lloyd/Workflow-Templates). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/docker_dockerhub_release_callable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_dockerhub_release_callable.yml b/.github/workflows/docker_dockerhub_release_callable.yml index 97c887d..5c8df7b 100644 --- a/.github/workflows/docker_dockerhub_release_callable.yml +++ b/.github/workflows/docker_dockerhub_release_callable.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Login to DockerHub Container Registry - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From ce8d428ab0807bd365590ad977ef0c913c740603 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 17:51:33 +0200 Subject: [PATCH 4/4] ci(deps): update rhysd/actionlint docker tag to v1.7.1 (#36) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rhysd/actionlint | container | patch | `1.7.0` -> `1.7.1` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Hapag-Lloyd/Workflow-Templates). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/default_linter_callable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default_linter_callable.yml b/.github/workflows/default_linter_callable.yml index a7230ed..cfc8aa1 100644 --- a/.github/workflows/default_linter_callable.yml +++ b/.github/workflows/default_linter_callable.yml @@ -89,7 +89,7 @@ jobs: needs: find-changes-for-shell-output if: needs.find-changes-for-shell-output.outputs.workflow == 'true' container: - image: rhysd/actionlint:1.7.0@sha256:5acca218639222e4afbc82fc6e9ef56cbe646ade3b07f3f5ec364b638258a244 + image: rhysd/actionlint:1.7.1@sha256:435ecdb63b1169e80ca3e136290072548c07fc4d76a044cf5541021712f8f344 options: --cpus 1 --user root steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6