Skip to content

Commit

Permalink
Merge branch 'main' into kayman-mk-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
kayman-mk authored May 29, 2024
2 parents aed2b91 + ce8d428 commit 06558de
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/default_linter_callable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_dockerhub_release_callable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
15 changes: 13 additions & 2 deletions update-workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -142,7 +153,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"

Expand Down

0 comments on commit 06558de

Please sign in to comment.