Skip to content

Commit b41448b

Browse files
fix script that gets the runtime def location (#633)
* fix script that gets the runtime def location * remove unused targets
1 parent 0a0a848 commit b41448b

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ cli-local: $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH)
7676
@ln $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH) /usr/local/bin/$(CLI_NAME)-dev
7777

7878
.PHONY: cli-e2e
79-
cli-e2e: cli-package
80-
81-
.PHONY: cli-package
82-
cli-package: $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH)
79+
cli-e2e: $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH)
8380
@cp $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH) $(OUT_DIR)/$(CLI_NAME)
8481

8582
$(OUT_DIR)/$(CLI_NAME)-linux-amd64: GO_FLAGS='GOOS=linux GOARCH=amd64 CGO_ENABLED=0'
@@ -175,8 +172,3 @@ $(GOBIN)/golangci-lint:
175172
@mkdir dist || true
176173
@echo installing: golangci-lint
177174
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.50.1
178-
179-
.PHONY: e2e-local-manifests
180-
e2e-local-manifests:
181-
cat /codefresh/volume/cli-v2/manifests/runtime.yaml | sed 's@github.com/codefresh-io/cli-v2/@/codefresh/volume/cli-v2/@' > /tmp/tmp_runtime.yaml
182-
mv /tmp/tmp_runtime.yaml manifests/runtime.yaml

hack/get-manifests-location.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ REPO="https://github.com/codefresh-io/csdp-official"
44
BRANCH="$1"
55

66
DEFAULT_MANIFESTS_LOCATION="https://raw.githubusercontent.com/codefresh-io/csdp-official/stable/csdp/hybrid/basic/runtime.yaml"
7-
CUSTOM_MANIFESTS_LOCATION="https://github.com/codefresh-io/csdp-official/csdp/hybrid/basic/runtime.yaml?ref=$BRANCH"
7+
RUNTIME_DEFINITION_URL="https://raw.githubusercontent.com/codefresh-io/csdp-official/$BRANCH/csdp/hybrid/basic/runtime.yaml"
88

99
git ls-remote --heads ${REPO} ${BRANCH} | grep ${BRANCH} >/dev/null
1010

@@ -14,4 +14,6 @@ if [ "$?" == "1" ]; then
1414
exit 0
1515
fi
1616

17-
echo "$CUSTOM_MANIFESTS_LOCATION"
17+
RUNTIME_DEFINITION_FILE="/codefresh/volume/runtime.yaml"
18+
curl --silent "$RUNTIME_DEFINITION_URL" | yq "(.spec.components[] | select(.type == \"kustomize\") | .url) += \"?ref=$BRANCH\"" | yq ".spec.bootstrapSpecifier += \"?ref=$BRANCH\"" >$RUNTIME_DEFINITION_FILE
19+
echo $RUNTIME_DEFINITION_FILE

0 commit comments

Comments
 (0)