Skip to content

Commit 8d7446e

Browse files
committed
export registry again from init-release
Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
1 parent a98a645 commit 8d7446e

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

.github/workflows/init-release.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ jobs:
5858
- name: Generate new set of manifests
5959
run: |
6060
set -ue
61-
export VERSION=${{ inputs.TARGET_VERSION }}
62-
export IMAGE_REGISTRY=quay.io
63-
export IMAGE_NAMESPACE=reggie-k
64-
export IMAGE_REPOSITORY=argocd-test
6561
make install-codegen-tools-local
66-
bash hack/update-manifests.sh
62+
make manifests-local VERSION=${{ inputs.TARGET_VERSION }}
6763
git diff
6864
6965
- name: Generate version compatibility table

Makefile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ PATH:=$(PATH):$(PWD)/hack
166166
# docker image publishing options
167167
DOCKER_PUSH?=false
168168
IMAGE_NAMESPACE?=
169-
IMAGE_REGISTRY?=
170-
IMAGE_REPOSITORY?=
171169
# perform static compilation
172170
DEFAULT_STATIC_BUILD:=true
173171
ifeq ($(IS_DARWIN),true)
@@ -219,10 +217,6 @@ ifndef IMAGE_REGISTRY
219217
IMAGE_REGISTRY="quay.io"
220218
endif
221219

222-
ifndef IMAGE_REPOSITORY
223-
IMAGE_REPOSITORY="argocd"
224-
endif
225-
226220
.PHONY: all
227221
all: cli image
228222

@@ -317,15 +311,12 @@ endif
317311

318312
.PHONY: manifests-local
319313
manifests-local:
320-
#DIST_DIR=${DIST_DIR} RERUN_FAILS=5 PACKAGES="./test/e2e" ARGOCD_E2E_RECORD=${ARGOCD_E2E_RECORD} ARGOCD_CONFIG_DIR=$(HOME)/.config/argocd-e2e ARGOCD_GPG_ENABLED=true NO_PROXY=* ./hack/test.sh -timeout $(ARGOCD_E2E_TEST_TIMEOUT) -v -args -test.gocoverdir="$(PWD)/test-results"
321-
322-
IMAGE_REGISTRY=${IMAGE_REGISTRY} IMAGE_NAMESPACE=${IMAGE_NAMESPACE} IMAGE_REPOSITORY=${IMAGE_REPOSITORY} ./hack/update-manifests.sh
323-
314+
./hack/update-manifests.sh
324315
.PHONY: manifests
325316
manifests: test-tools-image
326317
$(call run-in-test-client,make manifests-local IMAGE_REGISTRY='${IMAGE_REGISTRY}' IMAGE_NAMESPACE='${IMAGE_NAMESPACE}' IMAGE_REPOSITORY='${IMAGE_REPOSITORY}' IMAGE_TAG='${IMAGE_TAG}')
327-
328318
# consolidated binary for cli, util, server, repo-server, controller
319+
329320
.PHONY: argocd-all
330321
argocd-all: clean-debug
331322
CGO_ENABLED=${CGO_FLAG} GOOS=${GOOS} GOARCH=${GOARCH} GODEBUG="tarinsecurepath=0,zipinsecurepath=0" go build -v -ldflags '${LDFLAGS}' -o ${DIST_DIR}/${BIN_NAME} ./cmd

0 commit comments

Comments
 (0)