From 650aeb7466284423a910cfa5bdda0f654bebe2b3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 22 Mar 2023 12:22:30 +0100 Subject: [PATCH] Update options used in CI builds for testing compatibility Testing disabling 3.0 compatibility is useless as it's disabled by default in master, so disable 3.2 compatibility instead. Also enable 3.0 compatibility for one of the builds to check that doing this still works too. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/ci_msw_cross.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 962899a759..c0823556c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: - name: Ubuntu 18.04 wxGTK 3 STL runner: ubuntu-latest container: ubuntu:18.04 - configure_flags: --enable-stl --disable-compat30 + configure_flags: --enable-stl --enable-compat30 use_xvfb: true - name: Ubuntu 20.04 wxGTK 3 with clang runner: ubuntu-20.04 @@ -104,7 +104,7 @@ jobs: use_xvfb: true - name: Ubuntu 22.04 wxGTK with ASAN runner: ubuntu-22.04 - configure_flags: --disable-compat30 --disable-sys-libs --disable-webview + configure_flags: --disable-compat32 --disable-sys-libs --disable-webview skip_samples: true use_asan: true use_xvfb: true diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index 0f9fbaa602..8a85e33271 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -73,7 +73,7 @@ jobs: matrix: include: - name: wxMSW 64 bits - configure_flags: --enable-stl --disable-compat30 + configure_flags: --enable-stl --disable-compat32 - name: wxMSW 32 bits triplet: i686-w64-mingw32 env: