Skip to content

Commit

Permalink
Merge pull request #2716 from oasislabs/tjanez/upstream-goreleaser
Browse files Browse the repository at this point in the history
Bump GoReleaser to 0.127.0 and switch back to upstream
  • Loading branch information
tjanez committed Feb 24, 2020
2 parents 0205231 + 56d8904 commit 971c3f7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .changelog/2564.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: Bump GoReleaser to 0.127.0 and switch back to upstream
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
tar -xf ${GORELEASER_TARBALL}
sudo mv goreleaser /usr/local/bin
env:
GORELEASER_URL_PREFIX: https://github.com/oasislabs/goreleaser/releases/download/
GORELEASER_VERSION: 0.123.3-oasis1
GORELEASER_URL_PREFIX: https://github.com/goreleaser/goreleaser/releases/download/
GORELEASER_VERSION: 0.127.0
GORELEASER_TARBALL: goreleaser_Linux_x86_64.tar.gz
CURL_CMD: curl --proto =https --tlsv1.2 -sSL
- name: Create release
Expand Down
2 changes: 1 addition & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ define ENSURE_NO_CHANGELOG_FRAGMENTS =
$(ECHO_STDERR) "$(RED)Error: Could not obtain Change Log fragments for $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH) branch.$(OFF)"; \
exit 1; \
fi; \
if CHANGELOG_FRAGMENTS=`echo "$$CHANGELOG_FILES" | grep --invert-match --extended-regexp '(README.md|template.md.j2)'`; then \
if CHANGELOG_FRAGMENTS=`echo "$$CHANGELOG_FILES" | grep --invert-match --extended-regexp '(README.md|template.md.j2|.markdownlint.yml)'`; then \
$(ECHO_STDERR) "$(RED)Error: Found the following Change Log fragments on $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH) branch:"; \
$(ECHO_STDERR) "$${CHANGELOG_FRAGMENTS}$(OFF)"; \
exit 1; \
Expand Down

0 comments on commit 971c3f7

Please sign in to comment.