diff --git a/.github/workflows/deps-release-detect.yaml b/.github/workflows/deps-release-detect.yaml index 3f8b4057..e5574242 100644 --- a/.github/workflows/deps-release-detect.yaml +++ b/.github/workflows/deps-release-detect.yaml @@ -45,6 +45,7 @@ jobs: "dependencyName": "alpine" } ]' + deps_file="./cicd/tag-deps-version.txt" deps='${{ steps.dependabot-metadata.outputs.updated-dependencies-json }}' @@ -74,10 +75,10 @@ jobs: tagNewVersion="$(semver -i patch "$tagPrevVersion")" - echo "$tagPrevVersion" > ./cicd/tag-deps-version.txt - echo "$tagNewVersion" >> ./cicd/tag-deps-version.txt + echo "$tagPrevVersion" > "$deps_file" + echo "$tagNewVersion" >> "$deps_file" - git add ./cicd/tag-base-version.txt + git add "$deps_file" if git commit -m "bump dependency release to $tagNewVersion"; then push=1 fi diff --git a/.github/workflows/deps-release-tag.yaml b/.github/workflows/deps-release-tag.yaml index 8b3aa898..b0b665ba 100644 --- a/.github/workflows/deps-release-tag.yaml +++ b/.github/workflows/deps-release-tag.yaml @@ -26,9 +26,10 @@ jobs: - id: tag name: Determine tag run: | - old_version="$(head -n 1 ./cicd/tag-deps-version.txt)" + deps_file="./cicd/tag-deps-version.txt" + old_version="$(head -n 1 "$deps_file")" old_ref_name="v$old_version" - new_version="$(tail -n 1 ./cicd/tag-deps-version.txt)" + new_version="$(tail -n 1 "$deps_file")" new_ref_name="v$new_version" create=true diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index efd46797..9ea4f901 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -20,10 +20,10 @@ jobs: chmod +x /usr/local/bin/kubectl-kuttl - name: create kind cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.9.0 - name: set up helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4 - name: run e2e test run: kubectl kuttl test diff --git a/cicd/Dockerfile b/cicd/Dockerfile index 4ca13131..c3ccf33e 100644 --- a/cicd/Dockerfile +++ b/cicd/Dockerfile @@ -1,7 +1,7 @@ #syntax=docker/dockerfile-upstream:1.5 ARG GO_APP -FROM alpine:3.19.0 as deps +FROM alpine:3.19.1 as deps ARG GO_APP ARG GORELEASER_DIST_DIR=/go/src/dist @@ -28,7 +28,7 @@ RUN <