Small updates to CI

yuxies · Feb 22, 2022 · 49a9659 · 49a9659
1 parent aacb2e0
commit 49a9659
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -7,7 +7,7 @@ on:
       - 'stable/*'
   pull_request:
     branches:
-      - '*'
+      - '**'
   release:
     types:
       - created
@@ -25,7 +25,7 @@ jobs:
         include:
           - os: macos-10.15
             build_static: false
-            flags: CC=clang CXX=clang++ OSX=10.15
+            flags: CC=clang OSX=10.15
             download_requirements: brew install metis bash
           - os: macos-10.15
             build_static: false
@@ -51,13 +51,12 @@ jobs:
         run: |
           export ${{ matrix.flags }}
           ADD_ARGS=()
-          ADD_ARGS+=( --no-prompt )
           ADD_ARGS+=( --skip='ThirdParty/Metis ThirdParty/Mumps ThirdParty/Blas ThirdParty/Lapack' )
           ADD_BUILD_ARGS=()
           ADD_BUILD_ARGS+=( --tests main --enable-relocatable )
           ADD_BUILD_ARGS+=( --verbosity 2 )
           [[ ${{ matrix.build_static }} == "true" ]] && \
-          ADD_BUILD_ARGS+=( --disable-shared )
+          ADD_BUILD_ARGS+=( --static --with-lapack='-llapack -lblas -lgfortran -lquadmath -lm' )
           bash coinbrew/coinbrew fetch ${{ github.event.repository.name }} --skip-update \
           "${ADD_ARGS[@]}"
           bash coinbrew/coinbrew build ${{ github.event.repository.name }} \

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -7,7 +7,7 @@ on:
       - 'stable/*'
   pull_request:
     branches:
-      - '*'
+      - '**'
   release:
     types:
       - created
@@ -24,10 +24,8 @@ jobs:
           { os: windows-2019, arch: x86_64, msystem: mingw64, debug: false, suffix: "" },
           { os: windows-2019, arch: i686, msystem: mingw32, debug: true, suffix: "-dbg" },
           { os: windows-2019, arch: i686, msystem: mingw32, debug: false, suffix: "" },
-          { os: windows-2019, arch: msvc, msystem: mingw64, debug: true, suffix: "-mdd" },
           { os: windows-2019, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
-          { os: windows-2016, arch: msvc, msystem: mingw64, debug: true, suffix: "-mdd" },
-          { os: windows-2016, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
+          { os: windows-2022, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
         ]
     steps:
       - name: Checkout source
@@ -60,7 +58,6 @@ jobs:
       - name: Build project
         run: |
           ADD_ARGS=()
-          ADD_ARGS+=( --no-prompt )
           ADD_ARGS+=( --skip='ThirdParty/Metis ThirdParty/Mumps ThirdParty/Blas ThirdParty/Lapack' )
           ADD_BUILD_ARGS=()
           ADD_BUILD_ARGS+=( --build=x86_64-w64-mingw32 --tests main --enable-relocatable )