Skip to content

Commit b5abb45

Browse files
authored
Merge pull request #162 from lautis0503/version_0_4_0
Fix Github Actions using Rust nightly on Windows/MSYS2
2 parents 7cb28e8 + b04e476 commit b5abb45

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.github/workflows/windows.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Windows
33
on:
44
push:
55
branches:
6-
- version_0_2_0
6+
- version_0_4_0
77
pull_request:
88

99
env:
@@ -31,20 +31,22 @@ jobs:
3131
update: true
3232
msystem: ${{ matrix.environment.msystem }}
3333
pacboy: >-
34-
rust:p
34+
toolchain:p
35+
36+
- name: Install nightly Rust
37+
run: |
38+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
39+
sh rustup-init.sh -y --default-host x86_64-pc-windows-gnu --default-toolchain nightly --profile complete
40+
$USERPROFILE/.cargo/bin/cargo version
3541
3642
- name: Checkout repository
3743
uses: actions/checkout@v4
3844
with:
3945
fetch-depth: 0
4046

41-
- name: Install nightly Rust
42-
run: |
43-
rustup toolchain install nightly
44-
rustup default nightly
45-
4647
- name: Cargo build
47-
run: cargo build --profile release-lto --features use_winit,use_wgpu,devtools,sound,opl
48+
run: |
49+
$USERPROFILE/.cargo/bin/cargo build --profile release-lto --features use_winit,use_wgpu,devtools,sound,opl
4850
4951
- name: Copy files into install dir
5052
run: cp LICENSE README.md CHANGELOG.md CREDITS.md target/release-lto/martypc install
@@ -56,4 +58,4 @@ jobs:
5658
uses: actions/upload-artifact@v4
5759
with:
5860
name: martypc-windows-gha
59-
path: martypc
61+
path: martypc

0 commit comments

Comments
 (0)