Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release tool] refactor to allow for extensibility #9563

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .semaphore/release/hashrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ blocks:
jobs:
- name: Build and publish hashrelease
commands:
- if [[ ${SEMAPHORE_WORKFLOW_TRIGGERED_BY_SCHEDULE} == "true" ]]; then export BUILD_CONTAINER_IMAGES=true; export SKIP_PUBLISH_IMAGES=false; fi
- make hashrelease
- make hashrelease-publish
prologue:
commands:
- if [[ ${SEMAPHORE_WORKFLOW_TRIGGERED_BY_SCHEDULE} == "true" ]]; then export BUILD_CONTAINER_IMAGES=true; export SKIP_PUBLISH_IMAGES=false; fi
- export GITHUB_TOKEN=${MARVIN_GITHUB_TOKEN}
- cd release
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ e2e-test:
###############################################################################
# Build the release tool.
release/bin/release: $(shell find ./release -type f -name '*.go')
$(call build_binary, ./release/build, $@)
$(MAKE) -C release build

# Install ghr for publishing to github.
bin/ghr:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ require (
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
github.com/mipearson/rfw v0.0.0-20170619235010-6f0a6f3266ba
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.5.0
github.com/natefinch/atomic v1.0.1
github.com/nmrshll/go-cp v0.0.0-20180115193924-61436d3b7cfa
github.com/olekukonko/tablewriter v0.0.5
Expand Down Expand Up @@ -210,7 +211,6 @@ require (
github.com/mdlayher/genetlink v1.0.0 // indirect
github.com/mdlayher/netlink v1.1.0 // indirect
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
Expand Down
4 changes: 3 additions & 1 deletion release/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ clean:

bin/release: $(shell find . -name "*.go")
@mkdir -p bin && \
$(call build_binary, ./build, bin/release)
$(call build_binary, ./cmd, bin/release)

###############################################################################
# CI/CD
Expand All @@ -27,6 +27,8 @@ ci: static-checks
.PHONY: hashrelease
hashrelease: bin/release var-require-all-GITHUB_TOKEN
@bin/release hashrelease build

hashrelease-publish: bin/release
@bin/release hashrelease publish

###############################################################################
Expand Down
Loading
Loading