Skip to content

Commit df45b4a

Browse files
committed
Use the ubuntu 24.04 github-hosted runner for tests
libaio.so.1 is unavailable on Ubuntu 24.04. This makes a symbolic link from libaio.so.1 to libaio.so.1t64 for workaround.
1 parent cca8d11 commit df45b4a

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.github/workflows/run-tests.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
msrv:
6-
runs-on: ubuntu-latest
6+
runs-on: ubuntu-24.04
77
outputs:
88
msrv: ${{ steps.msrv.outputs.msrv }}
99
rust_toolchains: ${{ steps.msrv.outputs.rust_toolchains }}
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [ubuntu-latest]
23+
os: [ubuntu-24.04]
2424
rust_toolchain: ${{ fromJSON(needs.msrv.outputs.rust_toolchains) }}
2525

2626
runs-on: ${{ matrix.os }}
@@ -54,6 +54,7 @@ jobs:
5454
unzip basic.zip -d linux -x "META-INF/*"
5555
unzip sqlplus.zip -d linux -x "META-INF/*"
5656
IC_DIR=$PWD/$(ls -d linux/instantclient*)
57+
ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 $IC_DIR/libaio.so.1
5758
echo LD_LIBRARY_PATH=$IC_DIR:$LD_LIBRARY_PATH >> $GITHUB_ENV
5859
echo $IC_DIR >> $GITHUB_PATH
5960
@@ -90,13 +91,10 @@ jobs:
9091
rustup run ${{ matrix.rust_toolchain }} cargo test --features ${{ env.rust_features }} -- --nocapture
9192
9293
- name: cargo test on Wine (x86_64-pc-windows-gnu)
93-
# Runs only with MSRV.
94-
# The latest stable rust doesn't seem to work on Wine because of lack of bcryptprimitives.dll
95-
if: matrix.rust_toolchain != 'stable'
9694
run: |
9795
sudo apt-get update -q -y
98-
sudo apt-get install -y g++-mingw-w64-x86-64 g++-mingw-w64-i686 wine wine-binfmt
99-
sudo update-binfmts --unimport cli || true
96+
sudo apt-get install -y g++-mingw-w64-x86-64 wine binfmt-support wine-binfmt
97+
sudo update-binfmts --import wine
10098
curl -Lo basic-windows.zip https://download.oracle.com/otn_software/nt/instantclient/instantclient-basic-windows.zip
10199
mkdir windows
102100
unzip basic-windows.zip -d windows -x "META-INF/*"

0 commit comments

Comments
 (0)