Skip to content

Commit 7599b40

Browse files
joelanfordjoelanford
committed
[travis deploy] use dist directory for release builds
1 parent 1046707 commit 7599b40

File tree

4 files changed

+44
-43
lines changed

4 files changed

+44
-43
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
# Build artifacts
55
/build
6+
/dist
67
/tools/bin
78

89
# Website

‎Makefile

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fix: ## Fixup files in the repo.
4141

4242
.PHONY: clean
4343
clean: ## Cleanup build artifacts and tool binaries.
44-
rm -rf $(BUILD_DIR) tools/bin
44+
rm -rf $(BUILD_DIR) dist tools/bin
4545

4646
##@ Build
4747

@@ -187,59 +187,59 @@ changelog: ## Generate CHANGELOG.md and migration guide updates
187187

188188
# Build/install/release the SDK.
189189
release_builds := \
190-
build/operator-sdk-$(GIT_VERSION)-aarch64-linux-gnu \
191-
build/operator-sdk-$(GIT_VERSION)-x86_64-linux-gnu \
192-
build/operator-sdk-$(GIT_VERSION)-x86_64-apple-darwin \
193-
build/operator-sdk-$(GIT_VERSION)-ppc64le-linux-gnu \
194-
build/operator-sdk-$(GIT_VERSION)-s390x-linux-gnu \
195-
build/ansible-operator-$(GIT_VERSION)-aarch64-linux-gnu \
196-
build/ansible-operator-$(GIT_VERSION)-x86_64-linux-gnu \
197-
build/ansible-operator-$(GIT_VERSION)-x86_64-apple-darwin \
198-
build/ansible-operator-$(GIT_VERSION)-ppc64le-linux-gnu \
199-
build/ansible-operator-$(GIT_VERSION)-s390x-linux-gnu \
200-
build/helm-operator-$(GIT_VERSION)-aarch64-linux-gnu \
201-
build/helm-operator-$(GIT_VERSION)-x86_64-linux-gnu \
202-
build/helm-operator-$(GIT_VERSION)-x86_64-apple-darwin \
203-
build/helm-operator-$(GIT_VERSION)-ppc64le-linux-gnu \
204-
build/helm-operator-$(GIT_VERSION)-s390x-linux-gnu
190+
dist/operator-sdk-$(GIT_VERSION)-aarch64-linux-gnu \
191+
dist/operator-sdk-$(GIT_VERSION)-x86_64-linux-gnu \
192+
dist/operator-sdk-$(GIT_VERSION)-x86_64-apple-darwin \
193+
dist/operator-sdk-$(GIT_VERSION)-ppc64le-linux-gnu \
194+
dist/operator-sdk-$(GIT_VERSION)-s390x-linux-gnu \
195+
dist/ansible-operator-$(GIT_VERSION)-aarch64-linux-gnu \
196+
dist/ansible-operator-$(GIT_VERSION)-x86_64-linux-gnu \
197+
dist/ansible-operator-$(GIT_VERSION)-x86_64-apple-darwin \
198+
dist/ansible-operator-$(GIT_VERSION)-ppc64le-linux-gnu \
199+
dist/ansible-operator-$(GIT_VERSION)-s390x-linux-gnu \
200+
dist/helm-operator-$(GIT_VERSION)-aarch64-linux-gnu \
201+
dist/helm-operator-$(GIT_VERSION)-x86_64-linux-gnu \
202+
dist/helm-operator-$(GIT_VERSION)-x86_64-apple-darwin \
203+
dist/helm-operator-$(GIT_VERSION)-ppc64le-linux-gnu \
204+
dist/helm-operator-$(GIT_VERSION)-s390x-linux-gnu
205205

206206
.PHONY: release
207207
release: clean $(release_builds) $(release_builds:=.asc) ## Release the Operator SDK
208208

209-
build/operator-sdk-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
210-
build/operator-sdk-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
211-
build/operator-sdk-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
212-
build/operator-sdk-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
213-
build/operator-sdk-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
214-
build/operator-sdk-%-linux-gnu: GOARGS = GOOS=linux
215-
216-
build/ansible-operator-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
217-
build/ansible-operator-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
218-
build/ansible-operator-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
219-
build/ansible-operator-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
220-
build/ansible-operator-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
221-
build/ansible-operator-%-linux-gnu: GOARGS = GOOS=linux
222-
223-
build/helm-operator-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
224-
build/helm-operator-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
225-
build/helm-operator-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
226-
build/helm-operator-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
227-
build/helm-operator-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
228-
build/helm-operator-%-linux-gnu: GOARGS = GOOS=linux
229-
230-
build/%: $(SOURCES) ## Build the operator-sdk binary
209+
dist/operator-sdk-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
210+
dist/operator-sdk-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
211+
dist/operator-sdk-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
212+
dist/operator-sdk-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
213+
dist/operator-sdk-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
214+
dist/operator-sdk-%-linux-gnu: GOARGS = GOOS=linux
215+
216+
dist/ansible-operator-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
217+
dist/ansible-operator-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
218+
dist/ansible-operator-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
219+
dist/ansible-operator-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
220+
dist/ansible-operator-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
221+
dist/ansible-operator-%-linux-gnu: GOARGS = GOOS=linux
222+
223+
dist/helm-operator-%-aarch64-linux-gnu: GOARGS = GOOS=linux GOARCH=arm64
224+
dist/helm-operator-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
225+
dist/helm-operator-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
226+
dist/helm-operator-%-ppc64le-linux-gnu: GOARGS = GOOS=linux GOARCH=ppc64le
227+
dist/helm-operator-%-s390x-linux-gnu: GOARGS = GOOS=linux GOARCH=s390x
228+
dist/helm-operator-%-linux-gnu: GOARGS = GOOS=linux
229+
230+
dist/%: ## Build the operator-sdk release binaries
231231
{ \
232232
cmdpkg=$$(echo $* | sed -E "s/(operator-sdk|ansible-operator|helm-operator).*/\1/"); \
233233
$(GOARGS) go build $(GO_BUILD_ARGS) -o $@ ./cmd/$$cmdpkg; \
234234
}
235235

236-
build/%.asc: build/% ## Create release signatures for operator-sdk release binaries
236+
dist/%.asc: ## Create release signatures for operator-sdk release binaries
237237
{ \
238238
default_key=$$(gpgconf --list-options gpg | awk -F: '$$1 == "default-key" { gsub(/"/,""); print toupper($$10)}'); \
239239
git_key=$$(git config --get user.signingkey | awk '{ print toupper($$0) }'); \
240240
if [ "$${default_key}" = "$${git_key}" ]; then \
241-
gpg --output $@ --detach-sig build/$*; \
242-
gpg --verify $@ build/$*; \
241+
gpg --output $@ --detach-sig dist/$*; \
242+
gpg --verify $@ dist/$*; \
243243
else \
244244
echo "git and/or gpg are not configured to have default signing key $${default_key}"; \
245245
exit 1; \

‎release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ git verify-tag --verbose "$VER"
5656
make release
5757

5858
# Verify the signatures
59-
for f in $(ls build/*.asc); do gpg --verify $f; done
59+
for f in $(ls dist/*.asc); do gpg --verify $f; done

‎website/content/en/docs/contribution-guidelines/releasing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Call the script with the only argument being the new SDK version:
295295
$ ./release.sh v1.3.0
296296
```
297297

298-
`operator-sdk` release binaries and signatures will be in `build/`. Both binary and signature file names contain version, architecture,
298+
`operator-sdk` release binaries and signatures will be in `dist/`. Both binary and signature file names contain version, architecture,
299299
and platform information; signature file names correspond to the binary they were generated from suffixed with `.asc`.
300300
For example, signature file `operator-sdk-v1.3.0-x86_64-apple-darwin.asc` was generated from a binary named `operator-sdk-v1.3.0-x86_64-apple-darwin`.
301301
To verify binaries and tags, see the [verification section](#verifying-a-release).

0 commit comments

Comments
 (0)