ci: Fix release workflow env vars

mafredri · mafredri · commit 44bbe1011588 · 2023-01-12T11:05:53.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -39,16 +39,17 @@ permissions:
   # Necessary for GCP authentication (https://github.com/google-github-actions/setup-gcloud#usage)
   id-token: write
 
-env:
-  CODER_RELEASE: ${{ !github.event.inputs.snapshot }}
-
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   release:
     name: Create and publish
     runs-on: ${{ github.repository_owner == 'coder' && 'ubuntu-latest-16-cores' || 'ubuntu-latest' }}
     env:
+      CODER_RELEASE: ${{ !github.event.inputs.snapshot }}
+      CODER_RELEASE_INCREMENT: ${{ github.event.inputs.increment }}
+      CODER_RELEASE_DRAFT: ${{ github.event.inputs.draft }}
+      CODER_DRY_RUN: ${{ github.event.inputs.dry_run || github.event.inputs.snapshot }}
       # Necessary for Docker manifest
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
@@ -87,7 +88,7 @@ jobs:
           fi
 
           version_args=()
-          if [[ "${{ github.event.inputs.dry_run || github.event.inputs.snapshot }}" == *t* ]]; then
+          if [[ $CODER_DRY_RUN == *t* ]]; then
             # Allow dry-run of branches to pass.
             export CODER_IGNORE_MISSING_COMMIT_METADATA=1
             version_args+=(--dry-run)
@@ -104,7 +105,7 @@ jobs:
             ./scripts/release/tag_version.sh \
               "${version_args[@]}" \
               --ref "$ref" \
-              --${{ github.event.inputs.increment }}
+              --"$CODER_RELEASE_INCREMENT"
           )"
 
           # Generate notes.
@@ -232,10 +233,10 @@ jobs:
           set -euo pipefail
 
           publish_args=()
-          if [[ "${{ github.event.inputs.draft }}" == *t* ]]; then
+          if [[ $CODER_RELEASE_DRAFT == *t* ]]; then
             publish_args+=(--draft)
           fi
-          if [[ "${{ github.event.inputs.dry_run || github.event.inputs.snapshot }}" == *t* ]]; then
+          if [[ $CODER_DRY_RUN == *t* ]]; then
             publish_args+=(--dry-run)
           fi
           declare -p publish_args
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -167,9 +167,11 @@ else
 fi
 
 log
-gh workflow run release.yaml \
+# Use maybedryrun to echo the command.
+maybedryrun 0 gh workflow run release.yaml \
 	--ref "$branch" \
 	-F increment="$increment" \
+	-F snapshot=false \
 	"${args[@]}"
 log
 
