Add logrun to lib.sh

mafredri · mafredri · commit dd25b99ca8ba · 2023-01-12T15:19:13.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,6 +1,6 @@
 # GitHub release workflow.
 name: Release
-run-name: Release ${{ github.ref_name }}${{ inputs.dry_run && ' (DRYRUN)' || '' }}
+run-name: Release ${{ github.ref_name }}(${{ github.ref }})${{ inputs.dry_run && ' (DRYRUN)' || '' }}
 on:
   workflow_dispatch:
     inputs:
@@ -55,10 +55,10 @@ jobs:
       # Necessary for Docker manifest
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
-      - name: Prevent non-dry-run releases on branches
-        if: ${{ github.action_ref != 'main' && !inputs.dry_run }}
+      - name: Check release on main (or dry-run)
+        if: ${{ github.ref_name != 'main' && !inputs.dry_run }}
         run: |
-          echo "Release not allowed on ${{ github.action_ref }}, use dry-run."
+          echo "Release not allowed on ${{ github.ref_name }}, use dry-run."
           exit 1
 
       - uses: actions/checkout@v3
diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -131,11 +131,18 @@ maybedryrun() {
 		log "DRYRUN: $*"
 	else
 		shift
-		log $ "$@"
-		"$@"
+		logrun "$@"
 	fi
 }
 
+# logrun prints the given program and flags, and then executes it.
+#
+# Usage: logrun gh release create ...
+logrun() {
+	log $ "$*"
+	"$@"
+}
+
 # log prints a message to stderr.
 log() {
 	echo "$*" 1>&2
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -167,8 +167,7 @@ else
 fi
 
 log
-# Use maybedryrun to echo the command.
-maybedryrun 0 gh workflow run release.yaml \
+logrun gh workflow run release.yaml \
 	--ref "$branch" \
 	-F increment="$increment" \
 	"${args[@]}"
