From f7ccbadff2e3a2430e4b1b9118f9d3431b36cf9b Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 28 Aug 2021 22:35:59 +0200 Subject: [PATCH] Fix: Extract changelog in correct directory Signed-off-by: Knut Ahlers --- SHA256SUMS | 2 +- golang.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/SHA256SUMS b/SHA256SUMS index 896695c..2e74ad7 100644 --- a/SHA256SUMS +++ b/SHA256SUMS @@ -1,2 +1,2 @@ 05e4977d541b2ef07c757acca912b7b58b379fb425eceb3a1f53c829a78a4aa4 docker2aci.sh -e7662f4f1e9f7f0610000f4e91da49dfbc6355003490b25fb08f62d50e69a56d golang.sh +b9881de9a869366791e7998e5d03d710de1697202908a44316bdd7a023093f5d golang.sh diff --git a/golang.sh b/golang.sh index bc8f902..5ef9661 100755 --- a/golang.sh +++ b/golang.sh @@ -51,6 +51,8 @@ if [[ $NO_TESTS == false ]]; then go test "${go_params[@]}" ${PACKAGES} fi +changelog=$([ -f "${PWD}/History.md" ] && awk '/^#/ && ++c==2{exit}; /^#/f' "${PWD}/History.md" || echo "") + step "Cleanup build directory if present" rm -rf ${BUILD_DIR} @@ -125,14 +127,10 @@ fi if [[ ${DRAFT} == "true" ]]; then step "Create a drafted release" - { - [ -f History.md ] && awk '/^#/ && ++c==2{exit}; /^#/f' History.md || echo "" - } | github-release release --user ${GHUSER} --repo ${REPO} --tag ${DEPLOYMENT_TAG} --name ${DEPLOYMENT_TAG} --description - --draft || true + echo "${changelog}" | github-release release --user ${GHUSER} --repo ${REPO} --tag ${DEPLOYMENT_TAG} --name ${DEPLOYMENT_TAG} --description - --draft || true else step "Create a published release" - { - [ -f History.md ] && awk '/^#/ && ++c==2{exit}; /^#/f' History.md || echo "" - } | github-release release --user ${GHUSER} --repo ${REPO} --tag ${DEPLOYMENT_TAG} --name ${DEPLOYMENT_TAG} --description - || true + echo "${changelog}" | github-release release --user ${GHUSER} --repo ${REPO} --tag ${DEPLOYMENT_TAG} --name ${DEPLOYMENT_TAG} --description - || true fi step "Upload build assets"