From 2982406e5723f001b77cb237784a92fea8aae0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Fri, 21 Feb 2020 17:56:26 +0100
Subject: [PATCH 1/2] github: Bump GoReleaser to 0.127.0 and switch back to
 upstream

Our changes have been merged upstream, so we can now switch the GitHub
Actions release workflow back to upstream.
---
 .changelog/2564.internal.md   | 1 +
 .github/workflows/release.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/2564.internal.md

diff --git a/.changelog/2564.internal.md b/.changelog/2564.internal.md
new file mode 100644
index 00000000000..c52c479fa55
--- /dev/null
+++ b/.changelog/2564.internal.md
@@ -0,0 +1 @@
+github: Bump GoReleaser to 0.127.0 and switch back to upstream
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 92c17dccd29..45988b3f0e1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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

From 56d8904e7c554616ab83740d2df33edf45c52fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Fri, 21 Feb 2020 18:08:39 +0100
Subject: [PATCH 2/2] Make: Fix ENSURE_NO_CHANGELOG_FRAGMENTS helper

---
 common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index bd09c47b246..c82a5dbed17 100644
--- a/common.mk
+++ b/common.mk
@@ -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; \