gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/9f1597f5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b4d92c50 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/64a3a389 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4c2320cf (commit)
	from  https://github.com/Gnucash/gnucash/commit/949c9c97 (commit)



commit 9f1597f540911848ab14d4cfd5d78ac2b060ce08
Merge: 949c9c97c0 b4d92c50fb
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 4 11:48:07 2024 -0700

    Merge John Ralls's 'fix-mac-ci' into stable.


commit b4d92c50fb787d61f70c5f432ff831c6225e2b91
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 4 11:47:24 2024 -0700

    [MacOS Workflow] New dependency tarball for macOS Sonora.

diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index cdecc9ec50..143de00eee 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -20,7 +20,7 @@ jobs:
       uses: carlosperate/download-file-action at v2
       id: dependencies
       with:
-        file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-4.900-mac-dependencies.tar.xz'
+        file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-5.6-mac-dependencies.tar.xz'
         file-name: gnucash-dependencies.tar.xz
     - name: download googletest
       uses: carlosperate/download-file-action at v2
@@ -29,25 +29,23 @@ jobs:
       with:
         file-url: 'https://github.com/google/googletest/archive/release-1.10.0.tar.gz'
         file-name: googletest.tar.gz
-    - run: |
-        cd $HOME
-        mkdir gnucash
-        cd gnucash
+    - name: Extract Dependencies
+      run: |
+        mkdir -p $HOME/gnucash/inst
+        cd $HOME/gnucash/inst
         tar -xf $GITHUB_WORKSPACE/gnucash-dependencies.tar.xz
-        mkdir source
-        cd source
+        mkdir $HOME/gnucash/source
+        cd $HOME/gnucash/source
         tar -xf $GITHUB_WORKSPACE/googletest.tar.gz
         mv googletest-* googletest
-        cd ..
-        ls source
     - name: Configure GnuCash
       run: |
-        mkdir build
-        cd build
+        mkdir $HOME/gnucash/build
+        cd $HOME/gnucash/build
         cmake -GNinja -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DWITH_PYTHON=ON -DGTEST_ROOT=$SRCROOT/googletest $GITHUB_WORKSPACE
     - name: Build and Test GnuCash
       run: |
-        cd build
+        cd $HOME/gnucash/build
         ninja
         ninja check
       env:

commit 64a3a38945f173231275810d2035f2670750abe9
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu May 2 19:13:32 2024 -0700

    Add PKG_CONFIG_PATH to build  environment.

diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index 22861276fb..cdecc9ec50 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -10,8 +10,9 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout at v4
-    - run: |
-        echo "PATH=$PATH:$HOME/gnucash/inst/bin" >> $GITHUB_ENV
+    - name: configure Environment
+      run: |
+        echo "PATH=$HOME/gnucash/inst/bin:$PATH" >> $GITHUB_ENV
         echo "PREFIX=$HOME/gnucash/inst" >> $GITHUB_ENV
         echo "SRCROOT=$HOME/gnucash/source" >> $GITHUB_ENV
         brew install ninja

commit 4c2320cf7410484dca11320b30df6459a8f27b89
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 30 13:40:30 2024 -0700

    Use Homebrew to install ninja

diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index b9b19cef1f..22861276fb 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -14,6 +14,7 @@ jobs:
         echo "PATH=$PATH:$HOME/gnucash/inst/bin" >> $GITHUB_ENV
         echo "PREFIX=$HOME/gnucash/inst" >> $GITHUB_ENV
         echo "SRCROOT=$HOME/gnucash/source" >> $GITHUB_ENV
+        brew install ninja
     - name: download dependency tarball
       uses: carlosperate/download-file-action at v2
       id: dependencies



Summary of changes:
 .github/workflows/mac-tests.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)