From dce6ea57b2f9f7465f087e6de3a61e8501226f55 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 21 Mar 2024 09:51:22 +0100 Subject: [PATCH] release: Simplify the `create-new-release` action of `release.sh` Now that the version is an invariant for the entire workflow, it isn't required to obtain it with an environment variable. Just rely on the content of the `VERSION` file like other actions. Fixes #9064 - part VI Signed-off-by: Greg Kurz --- .github/workflows/release.yaml | 5 ----- tools/packaging/release/release.sh | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 17a499b02..39dc52cb7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,11 +11,6 @@ jobs: with: fetch-depth: 0 - - name: Get the new release version - run: | - release_version=$(./tools/packaging/release/release.sh release-version) - echo "RELEASE_VERSION=$release_version" >> "$GITHUB_ENV" - - name: Create a new release run: | ./tools/packaging/release/release.sh create-new-release diff --git a/tools/packaging/release/release.sh b/tools/packaging/release/release.sh index 42b70534b..c2830b1dd 100755 --- a/tools/packaging/release/release.sh +++ b/tools/packaging/release/release.sh @@ -108,9 +108,10 @@ EOF function _create_new_release() { - _check_required_env_var "RELEASE_VERSION" _check_required_env_var "GH_TOKEN" + RELEASE_VERSION="$(_release_version)" + _create_our_own_notes gh release create ${RELEASE_VERSION} \