fix workflows

This commit is contained in:
Vladimir Dubrovin 2026-04-06 11:43:51 +03:00
parent 9e7726d3ad
commit 98ae07176b
2 changed files with 3 additions and 12 deletions

View File

@ -3,10 +3,10 @@ name: C/C++ CI Linux
on: on:
push: push:
branches: [ "master" ] 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: pull_request:
branches: [ "master" ] 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: jobs:
ci: ci:

View File

@ -29,18 +29,9 @@ jobs:
- name: Mac libraries - name: Mac libraries
if: ${{ startsWith(matrix.target, 'macos') }} if: ${{ startsWith(matrix.target, 'macos') }}
run: brew install pcre2 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 - name: install Windows libraries
if: ${{ startsWith(matrix.target, 'windows') }} 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 - name: make with CMake POSIX
if: ${{ ! startsWith(matrix.target, 'windows') }} if: ${{ ! startsWith(matrix.target, 'windows') }}
run: | run: |