From 9e7726d3ad84556633d1c09336eea0405664d04b Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Mon, 6 Apr 2026 11:38:16 +0300
Subject: [PATCH] fix workflows

---
 .github/workflows/c-cpp-Linux.yml   | 2 --
 .github/workflows/c-cpp-MacOS.yml   | 3 ---
 .github/workflows/c-cpp-Windows.yml | 8 --------
 .github/workflows/c-cpp-cmake.yml   | 9 ++++++++-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/c-cpp-Linux.yml b/.github/workflows/c-cpp-Linux.yml
index a02e4af..02eb07b 100644
--- a/.github/workflows/c-cpp-Linux.yml
+++ b/.github/workflows/c-cpp-Linux.yml
@@ -16,8 +16,6 @@ jobs:
         target:
           - ubuntu-latest
           - ubuntu-24.04-arm
-          - macos-15
-          - windows-2022
     runs-on: ${{ matrix.target }}
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/c-cpp-MacOS.yml b/.github/workflows/c-cpp-MacOS.yml
index 7effe30..b7f026b 100644
--- a/.github/workflows/c-cpp-MacOS.yml
+++ b/.github/workflows/c-cpp-MacOS.yml
@@ -21,14 +21,11 @@ jobs:
 #    - name: configure
 #      run: ./configure
     - 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
diff --git a/.github/workflows/c-cpp-Windows.yml b/.github/workflows/c-cpp-Windows.yml
index 0da8353..0cc183a 100644
--- a/.github/workflows/c-cpp-Windows.yml
+++ b/.github/workflows/c-cpp-Windows.yml
@@ -14,30 +14,22 @@ jobs:
     strategy:
       matrix:
         target:
-          - ubuntu-latest
-          - ubuntu-24.04-arm
-          - macos-15
           - windows-2022
     runs-on: ${{ matrix.target }}
     steps:
     - uses: actions/checkout@v4
     - 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
     - name: make Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
       run: make -f Makefile.win
       env:
        LDFLAGS: '-L "c:/msys64/mingw64/lib"'
        CFLAGS: '-I "c:/msys64/mingw64/include"'
     - name: make clean Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
       run: make -f Makefile.win clean
     - name: Add msbuild to PATH
-      if: ${{ startsWith(matrix.target, 'windows') }}
       uses: microsoft/setup-msbuild@v3
     - name: make Windows MSVC
-      if: ${{ startsWith(matrix.target, 'windows') }}
       shell: cmd
       run: |
        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
diff --git a/.github/workflows/c-cpp-cmake.yml b/.github/workflows/c-cpp-cmake.yml
index 3dded31..4d73f44 100644
--- a/.github/workflows/c-cpp-cmake.yml
+++ b/.github/workflows/c-cpp-cmake.yml
@@ -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
     - name: make with CMake POSIX
       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
       if: ${{ startsWith(matrix.target, 'windows') }}
       shell: cmd