From f88f3e4fd76ca6d41818edd4bc66d7df013058ff Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Tue, 10 Oct 2023 17:10:31 -0700
Subject: [PATCH] Polish.

---
 .github/workflows/release-npm.yml | 4 ++--
 .github/workflows/release.yml     | 8 +++-----
 .github/workflows/rust-stub.yml   | 2 +-
 .github/workflows/rust.yml        | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index f8803f81f29..de469364fd4 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -6,8 +6,6 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     name: Publish npm packages
     runs-on: ubuntu-latest
-    env:
-      NPM_CHANNEL: latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
@@ -23,4 +21,6 @@ jobs:
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NIGHTLY: false
+          NPM_CHANNEL: latest
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0f1e3e20bfc..e27adb7f62b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
     outputs:
       publish:
         ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ||
-        github.event_name == 'pull_request' }}
+        contains(github.ref, 'develop-') || github.ref == 'master' }}
       nightly: ${{ steps.plan-step.outputs.nightly }}
       npm-channel: ${{ steps.plan-step.outputs.npm-channel }}
     env:
@@ -39,9 +39,7 @@ jobs:
       - id: plan-step
         run: bash ./scripts/release/planRelease.sh
         env:
-          NIGHTLY:
-            ${{ github.event_name == 'schedule' || contains(github.head_ref, 'develop-') ||
-            github.event_name == 'pull_request' }}
+          NIGHTLY: ${{ github.event_name != 'workflow_dispatch' }}
 
   build:
     strategy:
@@ -245,7 +243,7 @@ jobs:
           artifactErrorsFailBuild: true
           artifacts: artifacts/release/*
           body: 'This nightly release corresponds to the commit [${{ github.sha }}].'
-          name: 'Nightly (${{ github.sha }})'
+          name: 'Nightly'
           tag: 'nightly'
           prerelease: true
           replacesArtifacts: true
diff --git a/.github/workflows/rust-stub.yml b/.github/workflows/rust-stub.yml
index c37d9b49ece..7c427a41b1b 100644
--- a/.github/workflows/rust-stub.yml
+++ b/.github/workflows/rust-stub.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       - run: 'echo "Not affected, skipping"'
   coverage:
-    if: ${{ contains(github.head_ref, 'develop-') || endsWith(github.ref, 'master') }}
+    if: ${{ contains(github.ref, 'develop-') || endsWith(github.ref, 'master') }}
     name: Code coverage
     runs-on: ubuntu-latest
     needs:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2a8a546552f..f897bf48bc7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,7 +15,7 @@ on:
       - Makefile.toml
       - rust-toolchain.toml
 env:
-  WITH_COVERAGE: ${{ contains(github.head_ref, 'develop-') || endsWith(github.ref, 'master') }}
+  WITH_COVERAGE: ${{ contains(github.ref, 'develop-') || endsWith(github.ref, 'master') }}
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -80,7 +80,7 @@ jobs:
           path: ./report.txt
           if-no-files-found: error
   coverage:
-    if: ${{ contains(github.head_ref, 'develop-') || endsWith(github.ref, 'master') }}
+    if: ${{ contains(github.ref, 'develop-') || endsWith(github.ref, 'master') }}
     name: Code coverage
     runs-on: ubuntu-latest
     needs: