Skip to content

Commit 7a24462

Browse files
authored
Update GHA runners and use MSVC toolchain in Windows (#385)
2 parents d75672a + 15ecd71 commit 7a24462

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ jobs:
3636
name: Build debug artifacts
3737
strategy:
3838
matrix:
39-
build: [x86_64-linux, aarch64-linux, x86_64-macos, x86_64-win-gnu]
39+
build: [x86_64-linux, aarch64-linux, x86_64-macos, x86_64-win-msvc]
4040
include:
4141
- build: x86_64-linux
42-
os: ubuntu-20.04
42+
os: ubuntu-22.04
4343
target: x86_64-unknown-linux-gnu
4444
- build: aarch64-linux
45-
os: ubuntu-20.04
45+
os: ubuntu-22.04
4646
target: aarch64-unknown-linux-gnu
4747
- build: x86_64-macos
48-
os: macos-latest
48+
os: macos-14
4949
target: x86_64-apple-darwin
50-
- build: x86_64-win-gnu
51-
os: windows-2019
52-
target: x86_64-pc-windows-gnu
50+
- build: x86_64-win-msvc
51+
os: windows-2022
52+
target: x86_64-pc-windows-msvc
5353
runs-on: ${{ matrix.os }}
5454
steps:
5555
- name: Checkout sources

.github/workflows/release.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ jobs:
1616
strategy:
1717
fail-fast: false # don't fail other jobs if one fails
1818
matrix:
19-
build: [x86_64-linux, aarch64-linux, x86_64-macos, x86_64-win-gnu] #, x86_64-windows, win32-msvc
19+
build: [x86_64-linux, aarch64-linux, x86_64-macos, x86_64-win-msvc]
2020
include:
2121
- build: x86_64-linux
22-
os: ubuntu-20.04
22+
os: ubuntu-22.04
2323
target: x86_64-unknown-linux-gnu
2424
- build: aarch64-linux
25-
os: ubuntu-20.04
25+
os: ubuntu-22.04
2626
target: aarch64-unknown-linux-gnu
2727
- build: x86_64-macos
28-
os: macos-latest
28+
os: macos-14
2929
target: x86_64-apple-darwin
30-
- build: x86_64-win-gnu
31-
os: windows-2019
32-
target: x86_64-pc-windows-gnu
30+
- build: x86_64-win-msvc
31+
os: windows-2022
32+
target: x86_64-pc-windows-msvc
3333

3434
steps:
3535
- name: Checkout sources
@@ -39,6 +39,11 @@ jobs:
3939
uses: dtolnay/rust-toolchain@stable
4040
with:
4141
target: ${{ matrix.target }}
42+
43+
# Cache dependencies
44+
- uses: Swatinem/rust-cache@v2
45+
with:
46+
key: ${{ matrix.target }}-release
4247

4348
- name: Install cross for arm64 compilation
4449
if: matrix.build == 'aarch64-linux'

src/clipboard.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn wayland_clipboard(content: &str) -> bool {
4444
}
4545

4646
#[cfg(not(target_os = "linux"))]
47-
fn wayland_clipboard(content: &str) -> bool {
47+
fn wayland_clipboard(_content: &str) -> bool {
4848
false
4949
}
5050

0 commit comments

Comments
 (0)