Skip to content

Commit

Permalink
[ci] try using Ubuntu 24.04
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sunshowers committed Oct 24, 2024
1 parent e07be5f commit 0378136
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ jobs:

test-archive-target-runner:
name: Test archives with a target runner
# gcc-mingw-w64-x86-64-win32 requires Ubuntu 22.04
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- name: Install Rust toolchain
Expand All @@ -141,15 +140,15 @@ jobs:
targets: x86_64-pc-windows-gnu
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2

# The version of wine that comes with Ubuntu 22.04 is too old: it doesn't contain
# bcryptprimitives.dll, which is required to run binaries built with Rust 1.78+. We use the
# WineHQ PPA to get a newer version.
- name: Add Wine PPA
run: |
sudo dpkg --add-architecture i386
wget -nc https://dl.winehq.org/wine-builds/winehq.key
sudo apt-key add winehq.key
sudo add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
# # The version of wine that comes with Ubuntu 22.04 is too old: it doesn't contain
# # bcryptprimitives.dll, which is required to run binaries built with Rust 1.78+. We use the
# # WineHQ PPA to get a newer version.
# - name: Add Wine PPA
# run: |
# sudo dpkg --add-architecture i386
# wget -nc https://dl.winehq.org/wine-builds/winehq.key
# sudo apt-key add winehq.key
# sudo add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ noble main'
- name: Install wine and gcc-mingw-w64-x86-64-win32
run: |
sudo apt-get update
Expand Down

0 comments on commit 0378136

Please sign in to comment.