From 8b2b488d17defbe80a134add481ba9b9140336f7 Mon Sep 17 00:00:00 2001 From: Cory Schwartz Date: Thu, 3 Jun 2021 10:44:48 -0700 Subject: [PATCH] remove temporary edits --- .circleci/config.yml | 50 +++++++++++++++++++------------------- scripts/publish-release.sh | 10 +++----- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2dd564476..b0f8120f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -804,10 +804,10 @@ workflows: - build-all: requires: - test-short - # filters: - # tags: - # only: - # - /^v\d+\.\d+\.\d+(-rc\d+)?$/ + filters: + tags: + only: + - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - build-ntwk-calibration: requires: - test-short @@ -833,35 +833,35 @@ workflows: - build-macos: requires: - test-short - # filters: - # branches: - # ignore: - # - /.*/ - # tags: - # only: - # - /^v\d+\.\d+\.\d+(-rc\d+)?$/ + filters: + branches: + ignore: + - /.*/ + tags: + only: + - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - build-appimage: requires: - test-short - # filters: - # branches: - # ignore: - # - /.*/ - # tags: - # only: - # - /^v\d+\.\d+\.\d+(-rc\d+)?$/ + filters: + branches: + ignore: + - /.*/ + tags: + only: + - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - publish: requires: - build-all - build-macos - build-appimage - # filters: - # branches: - # ignore: - # - /.*/ - # tags: - # only: - # - /^v\d+\.\d+\.\d+(-rc\d+)?$/ + filters: + branches: + ignore: + - /.*/ + tags: + only: + - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - build-and-push-image: dockerfile: Dockerfile.lotus path: . diff --git a/scripts/publish-release.sh b/scripts/publish-release.sh index fe1c89caf..22572de60 100755 --- a/scripts/publish-release.sh +++ b/scripts/publish-release.sh @@ -18,8 +18,6 @@ do command -v "${REQUIRE}" >/dev/null 2>&1 || echo >&2 "'${REQUIRE}' must be installed" done -CIRCLE_TAG=DEFINITELYDOESNOTEXIST - #see if the release already exists by tag RELEASE_RESPONSE=` curl \ @@ -49,7 +47,7 @@ if [ "${RELEASE_ID}" = "null" ]; then # create it if it doesn't exist yet RELEASE_RESPONSE=` - echo curl \ + curl \ --request POST \ --header "Authorization: token ${GITHUB_TOKEN}" \ --header "Content-Type: application/json" \ @@ -60,8 +58,6 @@ else echo "release already exists" fi -RELEASE_RESPONSE=DEFINITELYDOESNOTEXIST - RELEASE_UPLOAD_URL=`echo "${RELEASE_RESPONSE}" | jq -r '.upload_url' | cut -d'{' -f1` echo "Preparing to send artifacts to ${RELEASE_UPLOAD_URL}" @@ -80,7 +76,7 @@ artifacts=( for RELEASE_FILE in "${artifacts[@]}" do echo "Uploading ${RELEASE_FILE}..." - echo curl \ + curl \ --request POST \ --header "Authorization: token ${GITHUB_TOKEN}" \ --header "Content-Type: application/octet-stream" \ @@ -100,7 +96,7 @@ miscellaneous=( for MISC in "${miscellaneous[@]}" do echo "Uploading release bundle: ${MISC}" - echo curl \ + curl \ --request POST \ --header "Authorization: token ${GITHUB_TOKEN}" \ --header "Content-Type: application/octet-stream" \