CI fixes for retest and add macOS 12 (#387)

baresip · Jun 5, 2022 · 195ef61 · 195ef61
1 parent 1bb0d29
commit 195ef61
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,16 +9,23 @@ jobs:
     strategy:
       matrix:
         compiler: [gcc, clang]
-        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-latest]
+        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-12]
         exclude:
-           - os: macos-latest
-             compiler: gcc
+          - os: macos-10.15
+            compiler: gcc
+          - os: macos-12
+            compiler: gcc
     env:
       CC: ${{ matrix.compiler }}
 
     steps:
     - uses: actions/checkout@v2
 
+    - name: openssl path macos
+      if: ${{ runner.os == 'macOS' }}
+      run: |
+        echo "OPENSSL_ROOT_DIR=/usr/local/opt/openssl" >> $GITHUB_ENV
+
     - name: make info
       run: |
         echo "OS: ${{ matrix.os }}"
@@ -34,16 +41,10 @@ jobs:
       run: make EXTRA_CFLAGS=-Werror CCACHE=
 
     - name: cmake
-      if: ${{ runner.os == 'Linux' }}
       run: |
         make cmake
         cmake --install build --prefix dist
     
-    - name: cmake
-      if: ${{ runner.os == 'macOS' }}
-      run: |
-        OPENSSL_ROOT_DIR=/usr/local/opt/openssl cmake -B build && cmake --build build -j
-
     - uses: sreimers/[email protected]
       with:
         name: rem

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -33,7 +33,8 @@ jobs:
         rm re/libre.so || true
         rm re/libre.dylib || true
         make -C rem librem.a
-        cd retest; make EXTRA_LFLAGS="--coverage" && ./retest -a
+        cd retest; cmake -B build -DCMAKE_EXE_LINKER_FLAGS="--coverage" && \
+          cmake --build build -j && ./build/retest -a
 
     - name: gcov
       run: | 

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -50,12 +50,15 @@ jobs:
         make -j$(nproc) -C baresip-win32 openssl
     
     - name: "build"
-      run: make -j$(nproc) -C baresip-win32 retest
+      run: |
+        cd baresip-win32/retest && \
+          cmake -B build -DCMAKE_TOOLCHAIN_FILE=../re/cmake/mingw.cmake && \
+          cmake --build build -j
     
     - uses: actions/upload-artifact@v2
       with:
         name: retest-exe
-        path: baresip-win32/retest/retest.exe
+        path: baresip-win32/retest/build/retest.exe
         retention-days: 1
 
   wintest: