chore: use git_tag instead of package_version

replicatedhq · Nov 15, 2024 · 6587d58 · 6587d58
1 parent c404b7d
commit 6587d58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/actions/build-custom-melange-package/action.yml b/.github/actions/build-custom-melange-package/action.yml
@@ -78,7 +78,7 @@ runs:
         make melange-build \
           MELANGE_CONFIG=${{ inputs.context }}/melange.yaml.tmpl \
           ARCHS=${{ inputs.arch }} \
-          PACKAGE_VERSION=${{ inputs.git-tag }}
+          GIT_TAG=${{ inputs.git-tag }}
 
     # upload artifacts generated by the melange build so they can later be used by apko
 

diff --git a/common.mk b/common.mk
@@ -113,14 +113,16 @@ melange-build: $(MELANGE_CACHE_DIR) melange-template
 		--signing-key build/melange.rsa \
 		--cache-dir=$(MELANGE_CACHE_DIR) \
 		--source-dir $(MELANGE_SOURCE_DIR) \
-		--out-dir build/packages/
+		--out-dir build/packages \
+		--git-repo-url github.com/replicatedhq/kots
+
 
 .PHONY: melange-template
-melange-template: check-env-MELANGE_CONFIG check-env-PACKAGE_VERSION
+melange-template: check-env-MELANGE_CONFIG check-env-GIT_TAG
 	mkdir -p build
-	envsubst '$${PACKAGE_VERSION}' < ${MELANGE_CONFIG} > build/melange.yaml
+	envsubst '$${GIT_TAG}' < ${MELANGE_CONFIG} > build/melange.yaml
 
 .PHONY: apko-template
-apko-template: check-env-APKO_CONFIG check-env-PACKAGE_VERSION
+apko-template: check-env-APKO_CONFIG check-env-GIT_TAG
 	mkdir -p build
-	envsubst '$${PACKAGE_VERSION}' < ${APKO_CONFIG} > build/apko.yaml
+	envsubst '$${GIT_TAG}' < ${APKO_CONFIG} > build/apko.yaml