fix build-kustomize-library

kubernetes-sigs · Feb 12, 2024 · 04ebcba · 04ebcba
1 parent 28e0f9e
commit 04ebcba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/release-api.yml b/.github/workflows/release-api.yml
@@ -120,10 +120,7 @@ jobs:
 
           # Create release draft
           changelog_file=$(mktemp)
-          currentBranch=$(git describe --tags)
-          module=$(echo "${currentBranch}" | cut -d'-' -f1)
-          version=${currentBranch##*-}
-          currentTag="${module}/${version}"
+          currentTag=$(git describe --tags)
           ./releasing/compile-changelog.sh "api" "${currentTag}" "${changelog_file}"
           
           # Create github releases

diff --git a/.github/workflows/release-cmd-config.yml b/.github/workflows/release-cmd-config.yml
@@ -124,10 +124,7 @@ jobs:
 
           # Create release draft
           changelog_file=$(mktemp)
-          currentBranch=$(git describe --tags)
-          module=$(echo "${currentBranch}" | cut -d'-' -f1)
-          version=${currentBranch##*-}
-          currentTag="${module}/${version}"
+          currentTag=$(git describe --tags)
           ./releasing/compile-changelog.sh "cmd/config" "${currentTag}" "${changelog_file}"
 
           # Create github releases

diff --git a/.github/workflows/release-kyaml.yml b/.github/workflows/release-kyaml.yml
@@ -97,10 +97,7 @@ jobs:
 
           # Create release draft
           changelog_file=$(mktemp)
-          currentBranch=$(git describe --tags)
-          module=$(echo "${currentBranch}" | cut -d'-' -f1)
-          version=${currentBranch##*-}
-          currentTag="${module}/${version}"
+          currentTag=$(git describe --tags)
           ./releasing/compile-changelog.sh "kyaml" "${currentTag}" "${changelog_file}"
 
           # Create github releases

diff --git a/cmd/gorepomod/internal/git/runner.go b/cmd/gorepomod/internal/git/runner.go
@@ -391,7 +391,7 @@ func (gr *Runner) GetMainBranch() string {
 }
 
 func (gr *Runner) GetCurrentVersionFromHead() string {
-	currentBranchName, err := gr.run(noHarmDone, "rev-parse", "--abbrev-ref", "release-kyaml-v0.16.3")
+	currentBranchName, err := gr.run(noHarmDone, "rev-parse", "--abbrev-ref", "HEAD")
 	if err != nil {
 		_ = fmt.Errorf("error getting current version")
 	}

diff --git a/releasing/build-kustomize-library.sh b/releasing/build-kustomize-library.sh
@@ -52,10 +52,8 @@ function build_kustomize_binary {
 
 main() {
 
-  currentBranch=$(git describe --tags)
-  module=$(echo "${currentBranch}" | cut -d'-' -f1)
-  version=${currentBranch##*-}
-  currentTag="${module}/${version}"
+  currentTag=$(git describe --tags)
+  version=${currentTag##*/}
 
   if grep -q -E '^[0-9]+(\.[0-9]+)*$' <<< "$version"
   then