Merge branch 'maint'

* maint: Update .github/workflows/main.yaml Update main.yaml ci: Simplify .github/scripts/build-macos-wxwidgets.sh
erlang · Aug 26, 2024 · e6b46c8 · e6b46c8
2 parents 494647a + b6fe0ae
commit e6b46c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -193,7 +193,7 @@ jobs:
         uses: actions/[email protected]
         with:
           path: wxWidgets
-          key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-12
+          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'