fix prerelease logic again

monacoremo · Aug 5, 2021 · 460e775 · 460e775
1 parent e5bbfd6
commit 460e775
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/get_cirrusci_freebsd b/.github/get_cirrusci_freebsd
@@ -20,6 +20,7 @@ wait_for_cirrusci() {
   gh_check_runs_url="$(get_gh_check_runs_url)"
   >&2 echo "Waiting to CirrusCI run to complete (two hours maximum)..."
   for _ in $(seq 1 120); do
+    echo "Checking for CirrusCI task status at $gh_check_runs_url ..."
     status=$(curl --fail "$gh_check_runs_url" | jq -r '.check_runs[] | .status')
     if [ "$status" == "completed" ]; then
       break

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -271,7 +271,6 @@ jobs:
     needs: Prepare-Release
     env:
       VERSION: ${{ needs.Prepare-Release.outputs.version }}
-      ISPRERELEASE: ${{ needs.Prepare-Release.outputs.isprerelease }}
     steps:
       - uses: actions/checkout@v2
       - uses: cachix/install-nix-action@v13
@@ -313,15 +312,16 @@ jobs:
 
       - name: Publish release on GitHub
         run: |
-          echo "Releasing version v$VERSION on GitHub (PRERELEASE=$PRERELEASE)..."
+          isprerelease="${{ needs.Prepare-Release.outputs.isprerelease }}"
+          echo "Releasing version v$VERSION on GitHub (isprerelease=$isprerelease)..."
 
           ghr \
             -t "${{ secrets.GITHUB_TOKEN }}" \
             -u "$GITHUB_USERNAME" \
             -r "$GITHUB_REPONAME" \
             -b "$(cat artifacts/release-changes/CHANGES.md)" \
             -replace \
-            ${ISPRERELEASE:+"-prerelease"} \
+            ${isprerelease:+"-prerelease"} \
             "v$VERSION" \
             release-bundle