Skip to content

Commit 10394dd

Browse files
committed
[ci] try using Ubuntu 24.04
The Wine PPA for Ubuntu 22.04 seems to currently be broken, returning a `Packages.xz` that doesn't match the `InRelease` manifest. Try out Ubuntu 24.04 and the shipped version of Wine.
1 parent e07be5f commit 10394dd

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,9 @@ jobs:
130130

131131
test-archive-target-runner:
132132
name: Test archives with a target runner
133-
# gcc-mingw-w64-x86-64-win32 requires Ubuntu 22.04
134-
runs-on: ubuntu-22.04
133+
# We need at least 24.04 for updated wine and mingw. 22.04 has a wine that's too old (and the
134+
# official WineHQ PPA breaks every so often).
135+
runs-on: ubuntu-24.04
135136
steps:
136137
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
137138
- name: Install Rust toolchain
@@ -140,20 +141,10 @@ jobs:
140141
toolchain: stable
141142
targets: x86_64-pc-windows-gnu
142143
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
143-
144-
# The version of wine that comes with Ubuntu 22.04 is too old: it doesn't contain
145-
# bcryptprimitives.dll, which is required to run binaries built with Rust 1.78+. We use the
146-
# WineHQ PPA to get a newer version.
147-
- name: Add Wine PPA
148-
run: |
149-
sudo dpkg --add-architecture i386
150-
wget -nc https://dl.winehq.org/wine-builds/winehq.key
151-
sudo apt-key add winehq.key
152-
sudo add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
153144
- name: Install wine and gcc-mingw-w64-x86-64-win32
154145
run: |
155146
sudo apt-get update
156-
sudo apt-get install winehq-stable gcc-mingw-w64-x86-64-win32
147+
sudo apt-get install wine gcc-mingw-w64-x86-64-win32
157148
- name: Build cargo-nextest
158149
run: cargo build --package cargo-nextest
159150
- name: Archive test fixtures

0 commit comments

Comments
 (0)