From 73582ab7805b3fb2def4531776c65c8bf7aba783 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Fri, 16 Aug 2024 11:57:51 +0200 Subject: [PATCH 1/3] ci: Simplify .github/scripts/build-macos-wxwidgets.sh --- .github/scripts/build-macos-wxwidgets.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/scripts/build-macos-wxwidgets.sh b/.github/scripts/build-macos-wxwidgets.sh index be087d9f9bbf..e3cad13d835a 100755 --- a/.github/scripts/build-macos-wxwidgets.sh +++ b/.github/scripts/build-macos-wxwidgets.sh @@ -18,11 +18,6 @@ cd wxWidgets --prefix=$PWD/release \ --with-cocoa \ --with-macosx-version-min=10.15 \ - --with-libjpeg=builtin \ - --with-libtiff=builtin \ - --with-libpng=builtin \ - --with-liblzma=builtin \ - --with-zlib=builtin \ - --with-expat=builtin + --disable-sys-libs make make install From 0244766c5bcace834ee5f6bc3f4e887091cd3316 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Tue, 20 Aug 2024 15:32:19 +0200 Subject: [PATCH 2/3] Update main.yaml --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 56d9883f14d6..86c46729c897 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -193,7 +193,7 @@ jobs: uses: actions/cache@v4.0.2 with: path: wxWidgets - key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-12 + key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-13 - name: Compile wxWidgets if: steps.wxwidgets-cache.outputs.cache-hit != 'true' From e86d8cf65fd98cb115d1d5b127ae2a3e068e75e2 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Tue, 20 Aug 2024 15:36:38 +0200 Subject: [PATCH 3/3] Update .github/workflows/main.yaml Co-authored-by: Lukas Larsson --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 86c46729c897..c4c7ec72a819 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -193,7 +193,7 @@ jobs: uses: actions/cache@v4.0.2 with: path: wxWidgets - key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-13 + key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-${{ hashFiles('.github/scripts/build-macos-wxwidgets.sh')}}-12 - name: Compile wxWidgets if: steps.wxwidgets-cache.outputs.cache-hit != 'true'