Merge pull request #783 from davidgiven/osx

More build script fixes.
davidgiven · Oct 16, 2024 · 0d4c747 · 0d4c747
2 parents f7efaa3 + 6cc7d7b
commit 0d4c747
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -27,7 +27,7 @@ jobs:
   build-macos-current:
     strategy:
       matrix:
-        runs-on: [macos-13, macos-15-arm64]
+        runs-on: [macos-13, macos-latest]
     runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v4
@@ -42,11 +42,11 @@ jobs:
       run: |
         brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
     - name: make
-      run: gmake -C fluxengine
+      run: gmake -C fluxengine -j $(nprocs)
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.event.repository.name }}.${{ github.sha }}.fluxengine.${{ matrix.runs-on }}.pkg
+        name: ${{ github.event.repository.name }}.${{ github.sha }}.fluxengine.${{ runner.arch }}.pkg
         path: fluxengine/FluxEngine.pkg
 
   build-windows:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
   build-macos:
     strategy:
       matrix:
-        runs-on: [macos-13, macos-15-arm64]
+        runs-on: [macos-13, macos-latest]
     runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v4
@@ -97,8 +97,8 @@ jobs:
 
     - name: make
       run: |
-        gmake
-        mv FluxEngine.pkg FluxEngine-${{ matrix.runs-on }}.pkg
+        gmake -j $(nprocs)
+        mv FluxEngine.pkg FluxEngine-${{ runner.arch }}.pkg
 
     - name: tag
       uses: EndBug/latest-tag@latest
@@ -114,15 +114,15 @@ jobs:
         token: ${{ github.token }}
         tag: dev
         assets: | 
-          FluxEngine-${{ matrix.runs-on }}.pkg
+          FluxEngine-${{ runner.arch }}.pkg
         fail-if-no-assets: false
 
     - name: release
       uses: softprops/action-gh-release@v1
       with:
         name: Development build ${{ env.RELEASE_DATE }}
         files: |
-          FluxEngine-${{ matrix.runs-on }}.pkg
+          FluxEngine-${{ runner.arch }}.pkg
         tag_name: dev
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/build/_progress.py b/build/_progress.py
diff --git a/build/ab.mk b/build/ab.mk
@@ -50,7 +50,7 @@ EXT ?=
 ifeq ($(PROGRESSINFO),)
 rulecount := $(shell $(MAKE) --no-print-directory -q $(OBJ)/build.mk PROGRESSINFO=1 && $(MAKE) -n $(MAKECMDGOALS) PROGRESSINFO=XXXPROGRESSINFOXXX | grep XXXPROGRESSINFOXXX | wc -l)
 ruleindex := 1
-PROGRESSINFO = "$(shell $(PYTHON) build/_progress.py $(ruleindex) $(rulecount))$(eval ruleindex := $(shell expr $(ruleindex) + 1))"
+PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ruleindex) + 1))"
 endif
 
 PKG_CONFIG_HASHES = $(OBJ)/.pkg-config-hashes/target-$(word 1, $(shell $(PKG_CONFIG) --list-all | md5sum))