Skip to content

Commit 5c5daa0

Browse files
committed
fix windows gnu build
1 parent f895090 commit 5c5daa0

File tree

4 files changed

+7
-38
lines changed

4 files changed

+7
-38
lines changed

.github/workflows/build-x86_64-pc-windows-gnu.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
release_version:
77
description: "Xtensa Rust release version to build"
88
required: true
9-
default: '1.90.0.0'
9+
default: "1.90.0.0"
1010
release_tag:
1111
description: "Release tag where artifacts will be stored (e.g. v1.90.0.0, untagged-00000)"
1212
required: true
@@ -38,6 +38,10 @@ jobs:
3838
needs: get_release
3939
runs-on: [self-hosted, Windows]
4040
steps:
41+
- name: Prepare dependencies
42+
run: |
43+
C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "pacman -R mingw-w64-ucrt-x86_64-gcc --noconfirm || echo 'Package not installed'"
44+
C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "pacman -S --noconfirm git make diffutils tar mingw-w64-x86_64-python mingw-w64-x86_64-cmake mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja"
4145
- name: Checkout repository
4246
uses: actions/checkout@v5
4347
- name: Checkout repository - esp-rs/rust
@@ -63,7 +67,8 @@ jobs:
6367
id: build-rust
6468
working-directory: "R:"
6569
continue-on-error: true
66-
run: C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2"
70+
run: |
71+
C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2"
6772
- name: Repackage binary
6873
id: repackage-binary
6974
continue-on-error: true

support/rust-build/x86_64-pc-windows-gnu/Prepare-BuildEnvironment.ps1

Lines changed: 0 additions & 12 deletions
This file was deleted.

support/rust-build/x86_64-pc-windows-gnu/build-rust-toolchain-msys2.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

support/rust-build/x86_64-pc-windows-gnu/prepare-msys2.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)