From 46bf856b807f75fa7a1b0084a40278ce0623fae3 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Thu, 19 Sep 2024 16:02:19 +0200 Subject: [PATCH 1/4] fix: always fetch the release version --- scripts/release.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index bc04f1a2c..f22ebf8e2 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -77,6 +77,8 @@ def print_summary(): atexit.register(print_summary) +global release_version + def main(): steps = [ @@ -122,10 +124,9 @@ def main(): ) status.append("Checked main branch and CI status") - if start_step <= 3: - release_version = get_release_version() - os.environ["RELEASE_VERSION"] = release_version - status.append(f"Release version set to {release_version}") + release_version = get_release_version() + os.environ["RELEASE_VERSION"] = release_version + status.append(f"Release version set to {release_version}") if start_step <= 4: colored_print("\nCreating a new branch for the release...", "yellow") From 5edf8bdc8b19732ab0df2d7d5c43b4883cc60873 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Thu, 19 Sep 2024 16:02:36 +0200 Subject: [PATCH 2/4] fix: rename issues by using different windows runner --- .github/workflows/rust.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 81c5d3b06..d9e8a94a4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -138,8 +138,7 @@ jobs: with: tool: cargo-nextest - - if: ${{ matrix.os != 'windows-latest' }} - uses: rui314/setup-mold@v1 + - uses: rui314/setup-mold@v1 - name: "Cargo nextest" run: >- @@ -214,7 +213,7 @@ jobs: - name: Setup | Install cargo-wix [Windows] # aarch64 is only supported in wix 4.0 development builds - if: startsWith(matrix.os, 'windows') && matrix.target != 'aarch64-pc-windows-msvc' + if: startsWith(matrix.name, 'Windows') && matrix.target != 'aarch64-pc-windows-msvc' run: cargo install --version 0.3.8 cargo-wix env: # cargo-wix does not require static crt @@ -284,7 +283,7 @@ jobs: echo "EXE_SUFFIX=${EXE_SUFFIX}" >> $GITHUB_OUTPUT - name: Build msi Installer - if: matrix.os == 'windows-latest' && matrix.target != 'aarch64-pc-windows-msvc' + if: startsWith(matrix.name, 'Windows') && matrix.target != 'aarch64-pc-windows-msvc' run: > cargo wix -v --no-build --nocapture -I install/windows/main.wxs --profile $env:CARGO_PROFILE @@ -394,7 +393,7 @@ jobs: path: ${{ steps.package.outputs.BIN_PATH }} - name: "Artifact upload: windows installer" - if: matrix.os == 'windows-latest' && matrix.target != 'aarch64-pc-windows-msvc' + if: startsWith(matrix.name, 'Windows') && matrix.target != 'aarch64-pc-windows-msvc' uses: actions/upload-artifact@v4 with: name: pixi-${{ matrix.target }}.msi From 975c95bc365feadd979a0092a904e34e7cb209a2 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Thu, 19 Sep 2024 17:02:22 +0200 Subject: [PATCH 3/4] Update scripts/release.py --- scripts/release.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release.py b/scripts/release.py index f22ebf8e2..9b519ab14 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -77,7 +77,6 @@ def print_summary(): atexit.register(print_summary) -global release_version def main(): From 776e04876f56e2757759e831f2d3e4ab3168745f Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Mon, 23 Sep 2024 11:08:11 +0200 Subject: [PATCH 4/4] lint --- scripts/release.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release.py b/scripts/release.py index 9b519ab14..5fceca6d4 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -78,7 +78,6 @@ def print_summary(): atexit.register(print_summary) - def main(): steps = [ "Start release process",