diff --git a/.github/workflows/release-api.yml b/.github/workflows/release-api.yml index 528fa5b522..180c8d351b 100644 --- a/.github/workflows/release-api.yml +++ b/.github/workflows/release-api.yml @@ -42,7 +42,7 @@ jobs: go install github.com/jstemmer/go-junit-report@latest make test-unit-all | go-junit-report -set-exit-code > report.xml - name: Test Summary - uses: test-summary/action@v1 + uses: test-summary/action@v2 with: paths: | ./report.xml @@ -120,7 +120,7 @@ jobs: # Create release draft changelog_file=$(mktemp) - currentBranch=$(git rev-parse --abbrev-ref HEAD) + currentBranch=$(git describe --tags) module=$(echo "${currentBranch}" | cut -d'-' -f1) version=${currentBranch##*-} currentTag="${module}/${version}" diff --git a/.github/workflows/release-cmd-config.yml b/.github/workflows/release-cmd-config.yml index 09bff739d0..83be354ae2 100644 --- a/.github/workflows/release-cmd-config.yml +++ b/.github/workflows/release-cmd-config.yml @@ -42,7 +42,7 @@ jobs: go install github.com/jstemmer/go-junit-report@latest make test-unit-all | go-junit-report -set-exit-code > report.xml - name: Test Summary - uses: test-summary/action@v1 + uses: test-summary/action@v2 with: paths: | ./report.xml @@ -124,7 +124,7 @@ jobs: # Create release draft changelog_file=$(mktemp) - currentBranch=$(git rev-parse --abbrev-ref HEAD) + currentBranch=$(git describe --tags) module=$(echo "${currentBranch}" | cut -d'-' -f1) version=${currentBranch##*-} currentTag="${module}/${version}" diff --git a/.github/workflows/release-kustomize.yml b/.github/workflows/release-kustomize.yml index 4b6baa68e3..01897d212b 100644 --- a/.github/workflows/release-kustomize.yml +++ b/.github/workflows/release-kustomize.yml @@ -40,7 +40,7 @@ jobs: go-version-file: go.work cache-dependency-path: "**/*.sum" - name: Test Summary - uses: test-summary/action@v1 + uses: test-summary/action@v2 with: paths: | ./report.xml diff --git a/.github/workflows/release-kyaml.yml b/.github/workflows/release-kyaml.yml index 8ccc514cad..4a3a8ab8c8 100644 --- a/.github/workflows/release-kyaml.yml +++ b/.github/workflows/release-kyaml.yml @@ -40,7 +40,7 @@ jobs: go install github.com/jstemmer/go-junit-report@latest make test-unit-all | go-junit-report -set-exit-code > report.xml - name: Test Summary - uses: test-summary/action@v1 + uses: test-summary/action@v2 with: paths: | ./report.xml @@ -97,7 +97,7 @@ jobs: # Create release draft changelog_file=$(mktemp) - currentBranch=$(git rev-parse --abbrev-ref HEAD) + currentBranch=$(git describe --tags) module=$(echo "${currentBranch}" | cut -d'-' -f1) version=${currentBranch##*-} currentTag="${module}/${version}" diff --git a/releasing/build-kustomize-library.sh b/releasing/build-kustomize-library.sh index 234b184c20..ab9eebf253 100755 --- a/releasing/build-kustomize-library.sh +++ b/releasing/build-kustomize-library.sh @@ -52,7 +52,7 @@ function build_kustomize_binary { main() { - currentBranch=$(git rev-parse --abbrev-ref HEAD) + currentBranch=$(git describe --tags) module=$(echo "${currentBranch}" | cut -d'-' -f1) version=${currentBranch##*-} currentTag="${module}/${version}"