bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-04-06 21:30:12 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix workflows

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-04-06 11:38:16 +03:00
parent 1391a31c35
commit 9e7726d3ad
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/c-cpp-Linux.yml vendored
View File

@ -16,8 +16,6 @@ jobs:
target: target:
- ubuntu-latest - ubuntu-latest
- ubuntu-24.04-arm - ubuntu-24.04-arm
- macos-15
- windows-2022
runs-on: ${{ matrix.target }} runs-on: ${{ matrix.target }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

3
.github/workflows/c-cpp-MacOS.yml vendored
View File

@ -21,14 +21,11 @@ jobs:
# - name: configure # - name: configure
# run: ./configure # run: ./configure
- name: Mac libraries - name: Mac libraries
if: ${{ startsWith(matrix.target, 'macos') }}
run: brew install pcre2 run: brew install pcre2
- name: make MacOS - name: make MacOS
if: ${{ startsWith(matrix.target, 'macos') }}
run: make -f Makefile.FreeBSD run: make -f Makefile.FreeBSD
env: env:
LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib" 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" 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 - name: make clean MacOS
if: ${{ startsWith(matrix.target, 'macos') }}
run: make -f Makefile.FreeBSD clean run: make -f Makefile.FreeBSD clean

8
.github/workflows/c-cpp-Windows.yml vendored
View File

@ -14,30 +14,22 @@ jobs:
strategy: strategy:
matrix: matrix:
target: target:
- ubuntu-latest
- ubuntu-24.04-arm
- macos-15
- windows-2022 - windows-2022
runs-on: ${{ matrix.target }} runs-on: ${{ matrix.target }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: install Windows libraries - 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 && c:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-pcre2 mingw-w64-x86_64-openssl
- name: make Windows - name: make Windows
if: ${{ startsWith(matrix.target, 'windows') }}
run: make -f Makefile.win run: make -f Makefile.win
env: env:
LDFLAGS: '-L "c:/msys64/mingw64/lib"' LDFLAGS: '-L "c:/msys64/mingw64/lib"'
CFLAGS: '-I "c:/msys64/mingw64/include"' CFLAGS: '-I "c:/msys64/mingw64/include"'
- name: make clean Windows - name: make clean Windows
if: ${{ startsWith(matrix.target, 'windows') }}
run: make -f Makefile.win clean run: make -f Makefile.win clean
- name: Add msbuild to PATH - name: Add msbuild to PATH
if: ${{ startsWith(matrix.target, 'windows') }}
uses: microsoft/setup-msbuild@v3 uses: microsoft/setup-msbuild@v3
- name: make Windows MSVC - name: make Windows MSVC
if: ${{ startsWith(matrix.target, 'windows') }}
shell: cmd shell: cmd
run: | run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"

9
.github/workflows/c-cpp-cmake.yml vendored
View File

@ -43,7 +43,14 @@ jobs:
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 && c:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-pcre2 mingw-w64-x86_64-openssl
- name: make with CMake POSIX - name: make with CMake POSIX
if: ${{ ! startsWith(matrix.target, 'windows') }} if: ${{ ! startsWith(matrix.target, 'windows') }}
run: mkdir build && cd build && cmake .. && cmake --build && mkdir ~/3proxy && DESTDIR=~/3proxy cmake --install . && cd .. && rm -rf build/ run: |
mkdir build
cd build
cmake ..
cmake --build .
mkdir ~/3proxy
DESTDIR=~/3proxy cmake --install .
cd .. && rm -rf build/
- name: make with CMake Win - name: make with CMake Win
if: ${{ startsWith(matrix.target, 'windows') }} if: ${{ startsWith(matrix.target, 'windows') }}
shell: cmd shell: cmd