try to fix maxOS build

jafl · Dec 9, 2023 · df45563 · df45563
1 parent d575e58
commit df45563
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,10 +51,7 @@ jobs:
         run: ./configure release
 
       - name: Build
-        run: |
-          touch libjx/image-build/*
-          touch libjexpr/code/JExprParserY.cpp libjexpr/code/JExprParserY.hpp
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make
+        run: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make
 
       - name: Run sonar-scanner
         env:
@@ -101,9 +98,7 @@ jobs:
         run: ./configure release
 
       - name: Build
-        run: |
-          touch libjexpr/code/JExprParserY.cpp libjexpr/code/JExprParserY.hpp
-          make
+        run: make
 
       - name: Build release packages
         run: |
@@ -151,9 +146,7 @@ jobs:
         run: ./configure release
 
       - name: Build
-        run: |
-          touch libjexpr/code/JExprParserY.cpp libjexpr/code/JExprParserY.hpp
-          make
+        run: make
 
       - name: Build & save CI packages
         if: ${{ ! startsWith(github.ref, 'refs/tags/') }}

diff --git a/configure b/configure
@@ -99,11 +99,11 @@ if [[ $SYS == Darwin ]]; then
 			$SUDO /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)";
 		fi
 
-		brew bundle;
-
-		if [[ -z $GITHUB_ACTIONS ]]; then
-			brew install imagemagick;	# python upgrade fails on github runner
+		if [[ -n $GITHUB_ACTIONS ]]; then
+			brew install [email protected] || brew link --overwrite [email protected];
+			brew install [email protected] || brew link --overwrite [email protected];
 		fi
+		brew bundle;
 	fi
 
 	if [[ $1 != package ]]; then
@@ -215,3 +215,6 @@ if [[ ! -e libjcore/code/jStringData.h && $1 != package ]]; then
 	cp -f libjcore/jStringData_init.h libjcore/code/jStringData.h;
 	chmod u+w libjcore/code/jStringData.h;
 fi
+
+touch libjx/image-build/*;
+touch libjexpr/code/JExprParserY.cpp libjexpr/code/JExprParserY.hpp;
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -26,8 +26,6 @@ parts:
     override-pull: |
       snapcraftctl pull
       sudo locale-gen en_US.UTF-8
-      touch libjx/image-build/*
-      touch libjexpr/code/JExprParserY.cpp libjexpr/code/JExprParserY.hpp
       sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
     build-environment:
       - LC_ALL: en_US.UTF-8