diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54168b4297d..3067a2d29f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,8 +32,6 @@ jobs: contains(github.ref, 'develop-') || github.ref_name == 'master' }} nightly: ${{ steps.plan-step.outputs.nightly }} npm-channel: ${{ steps.plan-step.outputs.npm-channel }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 - id: plan-step diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d8b46f61f74..cccd869dd6a 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.ref, 'develop-') || endsWith(github.ref, 'master') }} + WITH_COVERAGE: ${{ contains(github.ref, 'develop-') || github.ref_name == 'master' }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/scripts/release/planRelease.sh b/scripts/release/planRelease.sh index 6d9757d71e2..6f05e681fea 100644 --- a/scripts/release/planRelease.sh +++ b/scripts/release/planRelease.sh @@ -2,7 +2,7 @@ # Determine release channel. If contains "alpha", "beta", or "rc", # then publish to next, otherwise latest. -channel=unknown +channel=latest if git log -1 --pretty=%B | grep -e "-alpha" -e "-beta" -e "-rc"; then channel=next diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index cfcafee9367..04fe32fe83f 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -12,7 +12,7 @@ if [ -d ".yarn/versions" ]; then yarn version apply --all fi -if [[ "${NIGHTLY}" == "true" ]]; then +if [[ "$NIGHTLY" == "true" ]]; then timestamp=$(date +%Y%m%d.%H) preid="-nightly.$timestamp"