Skip to content

Commit cef72f0

Browse files
authored
🐛 Fix ko build workflows in Makefile (#1392)
* Use ko to build everything in cloudbuild.yaml * --push=false and undo cloudbuild.yaml changes for now
1 parent 46e94eb commit cef72f0

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

.ko.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
builds:
22
- id: scorecard
3-
main: ./
43
flags:
54
- -tags
65
- -netgo
7-
dir: ./
86
ldflags:
97
- "{{.Env.LDFLAGS}}"

Makefile

+21-21
Original file line numberDiff line numberDiff line change
@@ -195,46 +195,46 @@ ko-targets = scorecard-ko cron-controller-ko cron-worker-ko cron-cii-worker-ko c
195195
ko-build-everything: $(ko-targets)
196196

197197
scorecard-ko:
198-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/scorecard CGO_ENABLED=0 LDFLAGS="$(LDFLAGS)" \
199-
ko publish -B --bare --local \
200-
--platform=$(PLATFORM)\
198+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/scorecard LDFLAGS="$(LDFLAGS)" \
199+
ko publish -B \
201200
--push=false \
201+
--platform=$(PLATFORM)\
202202
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3
203203
cron-controller-ko:
204-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-controller CGO_ENABLED=0 LDFLAGS="$(LDFLAGS)" \
205-
ko publish -B --bare --local \
206-
--platform=$(PLATFORM)\
204+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-controller LDFLAGS="$(LDFLAGS)" \
205+
ko publish -B \
207206
--push=false \
207+
--platform=$(PLATFORM)\
208208
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/cron/controller
209209
cron-worker-ko:
210-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-worker
211-
ko publish -B --bare --local \
212-
--platform=$(PLATFORM)\
210+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-worker LDFLAGS="$(LDFLAGS)" \
211+
ko publish -B \
213212
--push=false \
213+
--platform=$(PLATFORM)\
214214
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/cron/worker
215215
cron-cii-worker-ko:
216-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cii-worker
217-
ko publish -B --bare --local \
218-
--platform=$(PLATFORM)\
216+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cii-worker LDFLAGS="$(LDFLAGS)" \
217+
ko publish -B \
219218
--push=false \
219+
--platform=$(PLATFORM)\
220220
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/cron/cii
221221
cron-bq-transfer-ko:
222-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-bq-transfer
223-
ko publish -B --bare --local \
224-
--platform=$(PLATFORM)\
222+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-bq-transfer LDFLAGS="$(LDFLAGS)" \
223+
ko publish -B \
225224
--push=false \
225+
--platform=$(PLATFORM)\
226226
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/cron/bq
227227
cron-webhook-ko:
228-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cron-webhook
229-
ko publish -B --bare --local \
230-
--platform=$(PLATFORM)\
228+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cron-webhook LDFLAGS="$(LDFLAGS)" \
229+
ko publish -B \
231230
--push=false \
231+
--platform=$(PLATFORM)\
232232
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/cron/webhook
233233
cron-github-server-ko:
234-
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-github-server
235-
ko publish -B --bare --local \
236-
--platform=$(PLATFORM)\
234+
KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-github-server LDFLAGS="$(LDFLAGS)" \
235+
ko publish -B \
237236
--push=false \
237+
--platform=$(PLATFORM)\
238238
--tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v3/clients/githubrepo/roundtripper/tokens/server
239239

240240
docker-targets = scorecard-docker cron-controller-docker cron-worker-docker cron-cii-worker-docker cron-bq-transfer-docker cron-webhook-docker cron-github-server-docker

0 commit comments

Comments
 (0)