From 6587d5843b14206ae5e0eb00e50a7746b47d0a1d Mon Sep 17 00:00:00 2001 From: Ricardo Maraschini Date: Fri, 15 Nov 2024 11:17:51 +0100 Subject: [PATCH] chore: use git_tag instead of package_version --- .../actions/build-custom-melange-package/action.yml | 2 +- common.mk | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-custom-melange-package/action.yml b/.github/actions/build-custom-melange-package/action.yml index 5595d34404..ea2408d879 100644 --- 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 index fefafffb73..29dbe864a5 100644 --- 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