Disable ubuntu again, libzip isn’t new enough. Switch coverity to macOS.

nih-at · Dec 22, 2023 · 00df34f · 00df34f
1 parent f6450d8
commit 00df34f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,32 +8,38 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest] #, windows-latest
+        os: [macos-latest] #, ubuntu-latest (libzip too old), windows-latest
     steps:
       - name: checkout
         uses: actions/checkout@v2
+
       - name: install dependencies (macOS)
         if: ${{ runner.os == 'macOS' }}
         run: |
           brew update
           brew reinstall libzip
+
       - name: install dependencies (Linux)
         if: ${{ runner.os == 'Linux' }}
         run: |
           sudo apt-get -qq update;
           sudo apt-get install -y libxml2-dev libsqlite3-0 libzip-dev zipcmp
+
       - name: prepare build directory
         run: |
           cmake -E make_directory ${{runner.workspace}}/build
+
       - name: configure (Unix)
         if: ${{ runner.os != 'Windows' }}
         working-directory: ${{runner.workspace}}/build
         run: |
           cmake ${{github.workspace}}
+
       - name: build
         working-directory: ${{runner.workspace}}/build
         run: |
           cmake --build . --config Release
+
       - name: test
         working-directory: ${{runner.workspace}}/build
         run: |

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Coverity
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     environment: coverity
 
     env:
@@ -30,8 +30,8 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        sudo apt-get -qq update;
-        sudo apt-get install -y libxml2-dev libsqlite3-0 libzip-dev zipcmp
+        brew update
+        brew reinstall libzip
 
     - name: Configure
       run: |
@@ -40,7 +40,7 @@ jobs:
 
     - name: Download Coverity
       run: |
-        wget --quiet https://scan.coverity.com/download/linux64 --post-data "token=$TOKEN&project=$PROJECT" -O "$COV_TOOLS.tar.gz"
+        wget --quiet https://scan.coverity.com/download/macOS --post-data "token=$TOKEN&project=$PROJECT" -O "$COV_TOOLS.tar.gz"
         mkdir "$COV_TOOLS"
         tar xzf "$COV_TOOLS.tar.gz" --strip 1 -C "$COV_TOOLS"
         ls -l "$COV_TOOLS"