Skip to content

Commit

Permalink
fix: always fetch the release version (#2087)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruben-arts authored Sep 23, 2024
1 parent d00e26e commit 7337860
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions scripts/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,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")
Expand Down

0 comments on commit 7337860

Please sign in to comment.