From 26abcbaf81706fedee6d3bf1878053c1e22e3e50 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 16 Oct 2024 14:12:09 +0200
Subject: [PATCH 1/3] Adjust OSX scripts... again.

---
 .github/workflows/ccpp.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 376a09f8..9f4b98fe 100644
--- 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:

From 3d0f82e4c618791833b2eba3b1554ef1d6a7354c Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 16 Oct 2024 14:21:47 +0200
Subject: [PATCH 2/3] Update ab.

---
 build/_progress.py | 8 --------
 build/ab.mk        | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 build/_progress.py

diff --git a/build/_progress.py b/build/_progress.py
deleted file mode 100644
index 5b08e0e4..00000000
--- a/build/_progress.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import sys
-
-try:
-    (_, current, max) = sys.argv
-    percent = int(100 * float(current) / float(max))
-    print(f"[{percent:>3}%]")
-except:
-    pass
diff --git a/build/ab.mk b/build/ab.mk
index 6d168c1a..81057a83 100644
--- 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))

From 6cc7d7b8fe7fa3a734df2d43b4f5b0d008c59447 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 16 Oct 2024 14:22:59 +0200
Subject: [PATCH 3/3] Update build script... again.

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 62429f3c..a5a33211 100644
--- 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,7 +114,7 @@ jobs:
         token: ${{ github.token }}
         tag: dev
         assets: | 
-          FluxEngine-${{ matrix.runs-on }}.pkg
+          FluxEngine-${{ runner.arch }}.pkg
         fail-if-no-assets: false
 
     - name: release
@@ -122,7 +122,7 @@ jobs:
       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 }}