Merge pull request #77818 from akrieger/fix_macs

Fix mac CI
CleverRaven · Nov 23, 2024 · 3e42c35 · 3e42c35
2 parents bdd222e + a196574
commit 3e42c35
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/.github/macports/macports.yml b/.github/macports/macports.yml
@@ -0,0 +1,5 @@
+ports:
+  - name: freetype
+    select: [ universal ]
+  - name: pkgconfig
+    select: [ universal ]
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -100,6 +100,19 @@ jobs:
             ccache_limit: 2G
             ccache_key: linux-llvm-10-break1
 
+          - compiler: clang++
+            os: macos-13
+            cmake: 0
+            native: osx
+            pch: 0
+            tiles: 1
+            sound: 1
+            localize: 1
+            title: Clang 14, macOS 12, Tiles, Sound, x64 and arm64 Universal Binary
+            # cache size ??? to be observed
+            ccache_limit: 4G
+            ccache_key: macos-llvm-14-universal-break1
+
           - compiler: g++-9
             os: ubuntu-latest
             cmake: 0
@@ -187,19 +200,6 @@ jobs:
             ccache_limit: 2G
             ccache_key: linux-gcc-9-cmake
 
-          - compiler: clang++
-            os: macos-12
-            cmake: 0
-            native: osx
-            pch: 0
-            tiles: 1
-            sound: 1
-            localize: 1
-            title: Clang 14, macOS 12, Tiles, Sound, x64 and arm64 Universal Binary
-            # cache size ??? to be observed
-            ccache_limit: 4G
-            ccache_key: macos-llvm-14-universal-break1
-
           # Reserving space for msvc ccache & vcpkg cache
             # observed usage:
             # vcpkg: ??? -> 500MB
@@ -286,6 +286,11 @@ jobs:
       if: ${{ env.SKIP == 'false' && runner.os == 'macOS' }}
       run: |
           HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel
+    - name: install macports (mac)
+      if: ${{ env.SKIP == 'false' && runner.os == 'macOS' && matrix.tiles == 1 }}
+      uses: melusina-org/setup-macports@v1
+      with:
+        parameters: '.github/macports/macports.yml'
     - name: prepare
       if: ${{ env.SKIP == 'false' }}
       run: bash ./build-scripts/requirements.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -102,15 +102,15 @@ jobs:
             ext: tar.gz
             content: application/gzip
           - name: macOS Curses Universal Binary (x64 and arm64)
-            os: macos-12
+            os: macos-13
             mxe: none
             tiles: 0
             sound: 0
             artifact: osx-terminal-only-universal
             ext: dmg
             content: application/x-apple-diskimage
           - name: macOS Tiles Universal Binary (x64 and arm64)
-            os: macos-12
+            os: macos-13
             mxe: none
             tiles: 1
             sound: 0
@@ -230,6 +230,11 @@ jobs:
         run: |
           HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel dylibbundler
           pip3 install dmgbuild biplist
+      - name: install macports (mac)
+        if: runner.os == 'macOS' && matrix.tiles == 1
+        uses: melusina-org/setup-macports@v1
+        with:
+          parameters: '.github/macports/macports.yml'
       - name: Create VERSION.TXT
         shell: bash
         run: |

diff --git a/Makefile b/Makefile
@@ -1289,11 +1289,7 @@ ifeq ($(SOUND), 1)
 endif  # ifeq ($(SOUND), 1)
 endif  # ifdef FRAMEWORK
 endif  # ifdef TILES
-
-ifndef FRAMEWORK
-	dylibbundler -of -b -x $(APPRESOURCESDIR)/$(APPTARGET) -d $(APPRESOURCESDIR)/ -p @executable_path/	
-endif  # ifndef FRAMEWORK
-
+	dylibbundler -of -b -x $(APPRESOURCESDIR)/$(APPTARGET) -d $(APPRESOURCESDIR)/ -p @executable_path/
 
 dmgdistclean:
 	rm -rf Cataclysm