Skip to content

Commit

Permalink
Merge branch 'master' into renovate/highlight.js-11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
0x6675636b796f75676974687562 authored Oct 31, 2024
2 parents 222f3a9 + f4812b8 commit f2e0c1e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-base-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Prepare formatted tags
run: |
echo FORMATTED_TAG=${{ matrix.base_image_tag }} | sed -e "s/-focal$//" | sed -e "s/20.04$/latest/" >> $GITHUB_ENV
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: save-deploy/base-images
push: true
Expand All @@ -83,7 +83,7 @@ jobs:
registry: ghcr.io
username: saveourtool
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: save-demo-cpg/builder
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
with:
fetch-depth: 2
- id: git-changed-files
uses: tj-actions/changed-files@v43
uses: tj-actions/changed-files@v44
with:
files_yaml: |
root_gradle:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
name: Prepare to build from branch
run: |
git switch --force-create ${{ inputs.branch }} origin/${{ inputs.branch }}
- uses: gittools/actions/gitversion/setup@v1.2.0
- uses: gittools/actions/gitversion/setup@v3.0.0
with:
versionSpec: 5.x
- uses: gittools/actions/gitversion/execute@v1.2.0
- uses: gittools/actions/gitversion/execute@v3.0.0
id: calculate-semver
with:
targetPath: ${{ env.CHARTS_DIR }}
Expand Down

0 comments on commit f2e0c1e

Please sign in to comment.