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

Gnucash · May 4, 2024 · 9f1597f · 9f1597f
2 parents 949c9c9 + b4d92c5
commit 9f1597f
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
@@ -10,15 +10,17 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@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
     - name: download dependency tarball
       uses: carlosperate/download-file-action@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@v2
@@ -27,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: