Skip to content

Commit e47ce1a

Browse files
authored
Fix overriding UPLOAD_BINARIES env var in makefile (#3221)
1 parent fe8d1b6 commit e47ce1a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@ initial-release: export APP_VERSION = appver-dev-$(call random-string)
189189
initial-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-install-v3,e2e/kots-release-install)
190190
initial-release: export V2_ENABLED = 0
191191
initial-release: check-env-EC_VERSION check-env-APP_VERSION
192-
UPLOAD_BINARIES=0 \
192+
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),0) \
193193
./scripts/build-and-release.sh
194194

195195
.PHONY: rebuild-release
196196
rebuild-release: export EC_VERSION = $(VERSION)-$(CURRENT_USER)
197197
rebuild-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-install-v3,e2e/kots-release-install)
198198
rebuild-release: check-env-EC_VERSION check-env-APP_VERSION
199-
UPLOAD_BINARIES=0 \
199+
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),0) \
200200
SKIP_RELEASE=1 \
201201
./scripts/build-and-release.sh
202202

@@ -207,7 +207,7 @@ upgrade-release: export APP_VERSION = appver-dev-$(call random-string)-upgrade-$
207207
upgrade-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-upgrade-v3,e2e/kots-release-upgrade)
208208
upgrade-release: export V2_ENABLED = 0
209209
upgrade-release: check-env-EC_VERSION check-env-APP_VERSION
210-
UPLOAD_BINARIES=1 \
210+
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),1) \
211211
./scripts/build-and-release.sh
212212

213213
.PHONY: go.mod

0 commit comments

Comments
 (0)