From 78eda5aa46fe23b11ea79364d8401e310387757f Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:24:24 +0300 Subject: [PATCH 1/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e6e3a72..c4f874b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -32,11 +32,13 @@ jobs: - name: ln Windows if: ${{ startsWith(matrix.target, 'windows') }} run: copy Makefile.win Makefile - - name: dir Windows + - name: dirs Windows if: ${{ startsWith(matrix.target, 'windows') }} run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - - name: make -# if: ${{ !startsWith(matrix.target, 'windows') }} + - name: SSLPlugin Linux + if: ${{ !startsWith(matrix.target, 'windows') }} + run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile' + - name: make run: make - name: mkdir if: ${{ startsWith(matrix.target, 'ubuntu') }} From a85bde7413cccd59853c78266dd1195ab25c7808 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:26:59 +0300 Subject: [PATCH 2/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index c4f874b..11b34b6 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -35,10 +35,10 @@ jobs: - name: dirs Windows if: ${{ startsWith(matrix.target, 'windows') }} run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - - name: SSLPlugin Linux + - name: SSLPlugin if: ${{ !startsWith(matrix.target, 'windows') }} run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile' - - name: make + - name: make run: make - name: mkdir if: ${{ startsWith(matrix.target, 'ubuntu') }} From 4cd1f0a526f077db253d2538c737369a117ce4c1 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:28:35 +0300 Subject: [PATCH 3/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 11b34b6..167f020 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -37,7 +37,7 @@ jobs: run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - name: SSLPlugin if: ${{ !startsWith(matrix.target, 'windows') }} - run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile' + run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' - name: make run: make - name: mkdir From afe420f44f634f4d79c1ee792bab055768e6c484 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:31:12 +0300 Subject: [PATCH 4/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 167f020..dd1692e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -37,7 +37,10 @@ jobs: run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - name: SSLPlugin if: ${{ !startsWith(matrix.target, 'windows') }} - run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' + run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile' + - name: SSLPlugin Linux + if: ${{ !startsWith(matrix.target, 'windows') }} + run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' - name: make run: make - name: mkdir From b82ac8f95b9a63655ed0ab7106d1d84520a353b9 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:31:39 +0300 Subject: [PATCH 5/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index dd1692e..707fef6 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -39,7 +39,7 @@ jobs: if: ${{ !startsWith(matrix.target, 'windows') }} run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile' - name: SSLPlugin Linux - if: ${{ !startsWith(matrix.target, 'windows') }} + if: ${{ startsWith(matrix.target, 'ubuntu') }} run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' - name: make run: make From 394ea892a149a614b1dcdc30e33acd79e2f80c32 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 14 Mar 2025 20:33:45 +0300 Subject: [PATCH 6/6] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 707fef6..ccaa136 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -35,12 +35,9 @@ jobs: - name: dirs Windows if: ${{ startsWith(matrix.target, 'windows') }} run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - - name: SSLPlugin - if: ${{ !startsWith(matrix.target, 'windows') }} - run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile' - name: SSLPlugin Linux if: ${{ startsWith(matrix.target, 'ubuntu') }} - run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' + run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' - name: make run: make - name: mkdir