diff --git a/.github/workflows/c-cpp-Linux.yml b/.github/workflows/c-cpp-Linux.yml index 02eb07b..a950e81 100644 --- a/.github/workflows/c-cpp-Linux.yml +++ b/.github/workflows/c-cpp-Linux.yml @@ -3,10 +3,10 @@ name: C/C++ CI Linux on: push: branches: [ "master" ] - paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp.yml' ] + paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ] pull_request: branches: [ "master" ] - paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp.yml' ] + paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ] jobs: ci: diff --git a/.github/workflows/c-cpp-cmake.yml b/.github/workflows/c-cpp-cmake.yml index 4d73f44..b3dcd7b 100644 --- a/.github/workflows/c-cpp-cmake.yml +++ b/.github/workflows/c-cpp-cmake.yml @@ -29,18 +29,9 @@ jobs: - name: Mac libraries if: ${{ startsWith(matrix.target, 'macos') }} run: brew install pcre2 - - name: make MacOS - if: ${{ startsWith(matrix.target, 'macos') }} - run: make -f Makefile.FreeBSD - env: - LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib" - CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include" - - name: make clean MacOS - if: ${{ startsWith(matrix.target, 'macos') }} - run: make -f Makefile.FreeBSD clean - name: install Windows libraries if: ${{ startsWith(matrix.target, 'windows') }} - run: vcpkg install pcre2:x64-windows && c:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-pcre2 mingw-w64-x86_64-openssl + run: vcpkg install pcre2:x64-windows - name: make with CMake POSIX if: ${{ ! startsWith(matrix.target, 'windows') }} run: |