Skip to content

Commit

Permalink
Bump Ubuntu CI to 24.04
Browse files Browse the repository at this point in the history
This brings in newer versions of compilers. The new version of wine now
needs the file extension on the executable when specified by path
  • Loading branch information
dfandrich committed Jun 11, 2024
1 parent 6a52055 commit 2ce8e4a
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ env:
MAKEFLAGS: -j 2

jobs:
build-22_04:
name: 'Ubuntu 22.04 native and cross-compiled builds'
runs-on: ubuntu-22.04
build-24_04:
name: 'Ubuntu 24.04 native and cross-compiled builds'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: 'Install deps'
Expand All @@ -29,19 +29,19 @@ jobs:
sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends
make
clang
gcc-10-i686-linux-gnu
gcc-14-i686-linux-gnu
libc6-dev-i386-cross
gcc-mingw-w64
wine
dos2unix
qemu-user
gcc-10-aarch64-linux-gnu
gcc-14-aarch64-linux-gnu
libc6-dev-arm64-cross
gcc-10-arm-linux-gnueabi
gcc-14-arm-linux-gnueabi
libc6-dev-armel-cross
gcc-10-powerpc-linux-gnu
gcc-14-powerpc-linux-gnu
libc6-dev-powerpc-cross
gcc-10-powerpc64-linux-gnu
gcc-14-powerpc64-linux-gnu
libc6-dev-ppc64-cross
- name: 'Compile with gcc'
run: make linux
Expand All @@ -52,38 +52,41 @@ jobs:
- name: 'Run tests with clang'
run: make test
- name: 'Compile with gcc 32-bit'
run: make clean && make linux LINUX_CC=i686-linux-gnu-gcc-10 LINUX_CFLAGS='-m32 -O2 -DUNIX -Wall -Wshadow -Wpedantic -Wcast-qual -Wcast-align -Wwrite-strings -Wno-attributes' LDFLAGS=-static
run: make clean && make linux LINUX_CC=i686-linux-gnu-gcc-14 LINUX_CFLAGS='-m32 -O2 -DUNIX -Wall -Wshadow -Wpedantic -Wcast-qual -Wcast-align -Wwrite-strings -Wno-attributes' LDFLAGS=-static
- name: 'Run tests with gcc 32-bit'
run: make test
- name: 'Compile with gcc-aarch64'
run: make clean && make linux LINUX_CC=aarch64-linux-gnu-gcc-10 LDFLAGS=-static
run: make clean && make linux LINUX_CC=aarch64-linux-gnu-gcc-14 LDFLAGS=-static
- name: 'Run tests with gcc-aarch64'
run: make test TESTWRAPPER=qemu-aarch64
- name: 'Compile with gcc-arm'
run: make clean && make linux LINUX_CC=arm-linux-gnueabi-gcc-10 LDFLAGS=-static
run: make clean && make linux LINUX_CC=arm-linux-gnueabi-gcc-14 LDFLAGS=-static
- name: 'Run tests with gcc-arm'
run: make test TESTWRAPPER=qemu-arm
- name: 'Compile with gcc-powerpc'
run: make clean && make linux LINUX_CC=powerpc-linux-gnu-gcc-10 LDFLAGS=-static
run: make clean && make linux LINUX_CC=powerpc-linux-gnu-gcc-14 LDFLAGS=-static
- name: 'Run tests with gcc-powerpc'
run: make test TESTWRAPPER=qemu-ppc
- name: 'Compile with gcc-powerpc64'
run: make clean && make linux LINUX_CC=powerpc64-linux-gnu-gcc-10 LDFLAGS=-static
run: make clean && make linux LINUX_CC=powerpc64-linux-gnu-gcc-14 LDFLAGS=-static
- name: 'Run tests with gcc-powerpc64'
run: make test TESTWRAPPER=qemu-ppc64
- name: 'Set up wine'
run: |
cat >wine-wrapper <<EOF
#!/bin/bash
set -o pipefail
# wine now needs the file extension on the executable when specified by path
EXE="\$1".exe
shift
# Show all errors except for the ones about querying the display
WINEDEBUG=-all,err+all,-explorer,-rpc wine "\$@" |& dos2unix
WINEDEBUG=-all,err+all,-winediag,-systray wine "\$EXE" "\$@" |& dos2unix
EOF
chmod 755 wine-wrapper
# Run wine once to set it up, which displays some logs that would mess up tests
WINEDEBUG=-all wine cmd /c exit
- name: 'Compile with mingw32-posix'
run: make clean && make linux LINUX_CC=x86_64-w64-mingw32-gcc-10-posix
run: make clean && make linux LINUX_CC=x86_64-w64-mingw32-gcc-13-posix
- name: 'Run tests with mingw32-posix+wine'
run: make test TESTWRAPPER=./wine-wrapper
- name: 'Compile with mingw32'
Expand Down

0 comments on commit 2ce8e4a

Please sign in to comment.