From 44add0de26a6ef7c185d8dd7d72a9670e0bf0f49 Mon Sep 17 00:00:00 2001 From: crystal Date: Mon, 24 Jul 2023 23:24:53 -0600 Subject: [PATCH] Revert "release candidate tag" This reverts commit b40c337a0d9afe1fedf48f10e07ee24b108d9757. --- .ci-make.sh | 3 +-- .crystalintegration.yml | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 8641122..a35bf15 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -4,7 +4,6 @@ CI_VERIFY_API="https://codeberg.org" # Query the Forgejo API at this URL to chec CI_VERIFY_REPO="forgejo/forgejo" # Check this repo at the Forgejo API for upstream CI status CI_VERIFY_RETRY_TIME=120 # How long to wait in seconds before retrying if the pipeline is pending CI_VERIFY_RETRY_COUNT=30 # How many times to retry before giving up if the pipeline is pending -BIN_DL_REPO="forgejo-experimental/forgejo" # Use experimental repo for RC binary download case "$1" in "submodule-build") @@ -45,7 +44,7 @@ case "$1" in ;; "download-binary") if [ $CI_COMMIT_TAG ] ; then - CI_RELEASE_ASSETS=$(curl $CI_VERIFY_API/api/v1/repos/$BIN_DL_REPO/releases/tags/$CI_COMMIT_TAG | jq -c '.assets[]' | grep linux-amd64) + CI_RELEASE_ASSETS=$(curl $CI_VERIFY_API/api/v1/repos/$CI_VERIFY_REPO/releases/tags/$CI_COMMIT_TAG | jq -c '.assets[]' | grep linux-amd64) CI_RELEASE_BINARY_URL=$(echo "$CI_RELEASE_ASSETS" | grep linux-amd64\" | jq -r --jsonargs .browser_download_url) CI_RELEASE_SHA256=$(curl $(echo "$CI_RELEASE_ASSETS" | grep linux-amd64.sha256\" | jq -r --jsonargs .browser_download_url) | cut -d ' ' -f1) wget --content-disposition $CI_RELEASE_BINARY_URL diff --git a/.crystalintegration.yml b/.crystalintegration.yml index f7fe17c..3203fd5 100644 --- a/.crystalintegration.yml +++ b/.crystalintegration.yml @@ -316,7 +316,7 @@ pipeline: - "*.deb.sha256" api_key: from_secret: sc_api_key - prerelease: true + prerelease: false skip_verify: true when: event: [ tag ] @@ -331,7 +331,7 @@ pipeline: - "*.deb.sha256" api_key: from_secret: cb_api_key - prerelease: true + prerelease: false skip_verify: true when: event: [ tag ] @@ -341,7 +341,7 @@ pipeline: group: upload environment: FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: crystal-experimental + FORGEJO_OWNER: crystal DEBIAN_DIST: bullseye DEBIAN_COMPONENT: forgejo secrets: [ cfo_api_key ]