Update workflow and environment

2026-04-12 16:00:11 +08:00 · 2026-04-08 20:48:02 +03:00 · 2026-04-08 20:48:02 +03:00 · 2a07b70de6
commit 2a07b70de6
parent 8cb8be1be8
15 changed files with 53 additions and 94 deletions
--- a/.github/workflows/build-rpm-arm64.yml
+++ b/.github/workflows/build-rpm-arm64.yml
@ -1,4 +1,4 @@
-name: RPM build arm
+name: RPM build aarch64

 on:
  push:
@ -11,10 +11,10 @@ jobs:
    strategy:
      matrix:
        target:
-          - ubuntu-latest
+          - ubuntu-24.04-arm
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - name: env
      run: |
       pwd
@ -23,33 +23,12 @@ jobs:
       echo "MAJOR=$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV
       echo "SUBMAJOR=$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV
       echo "MINOR=$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV
+    - name: echo env
+      run: echo "release $RELEASE version $VERSION major $MAJOR submajor $SUBMAJOR minor $MINOR"
    - name: Linux libraries
      run: |
       sudo apt update
-       sudo dpkg --add-architecture arm64
-       echo "Types: deb" > ~/ubuntu.sources
-       echo "URIs: http://archive.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble noble-updates noble-backports" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >> ~/ubuntu.sources 
-       echo "URIs: http://security.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble-security" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >>~/ubuntu.sources 
-       echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/ubuntu.sources
-       echo "Suites: noble noble-updates" >>~/ubuntu.sources
-       echo "Components: main restricted universe multiverse" >>~/ubuntu.sources
-       echo "Architectures: arm64" >>~/ubuntu.sources
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources
-       sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
-       sudo apt update
-       sudo apt install libssl-dev:arm64 libpam0g:arm64 libpam0g-dev:arm64 libpcre2-dev:arm64 rpm crossbuild-essential-arm64
+       sudo apt install libssl-dev libpam-dev libpcre2-dev rpm
    - name: make rpmbuild dir
      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
    - name: configure rpm env
@ -61,11 +40,12 @@ jobs:
      run: |
       ret=`pwd`
       cd ~/rpmbuild/SPECS
-       rpmbuild -ba --define "PAMLIB pam0g" --define "_arch aarch64" --define "cross yes" --target=aarch64-linux-gnueabi 3proxy-$RELEASE.spec
+       rpmbuild -ba 3proxy-$RELEASE.spec
       cd $ret
-       mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.arm64.rpm
+       mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.aarch64.rpm
    - name: Get artifact
      uses: actions/upload-artifact@v4
      with:
-       name: "3proxy-${{ env.RELEASE }}-arm64.rpm"
+       name: "3proxy-${{ env.RELEASE }}-aarch64.rpm"
       path: "*.rpm"
+
--- a/.github/workflows/build-rpm-armhf.yml
+++ b/.github/workflows/build-rpm-armhf.yml
@ -1,4 +1,4 @@
-name: RPM build arm
+name: RPM build armhf

 on:
  push:
@ -14,7 +14,7 @@ jobs:
          - ubuntu-latest
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - name: env
      run: |
       pwd
@ -49,7 +49,7 @@ jobs:
       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources
       sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
       sudo apt update
-       sudo apt install libssl-dev:armhf libpam0g:armhf libpam0g-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-armhf
+       sudo apt install libssl3t64:armhf openssl:armhf libssl-dev:armhf libpam0g:armhf libpam0g-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-armhf 
    - name: make rpmbuild dir
      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
    - name: configure rpm env
@ -61,12 +61,18 @@ jobs:
      run: |
       ret=`pwd`
       cd ~/rpmbuild/SPECS
+       PATH=/usr/arm-linux-gnueabihf/bin:$PATH
+       export PATH=$PATH
+       CC=arm-linux-gnueabihf-gcc
+       export CC=$CC
+       export RPATH=/usr/arm-linux-gnueabihf/lib:$RPATH
+       export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:$LD_LIBRARY_PATH
       rpmbuild -ba --define "PAMLIB pam0g" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec
       cd $ret
-       mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.arm.rpm
+       mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.armhf.rpm
    - name: Get artifact
      uses: actions/upload-artifact@v4
      with:
-       name: "3proxy-${{ env.RELEASE }}-arm.rpm"
+       name: "3proxy-${{ env.RELEASE }}-armhf.rpm"
       path: "*.rpm"

--- a/.github/workflows/build-rpm-x86-64.yml
+++ b/.github/workflows/build-rpm-x86-64.yml
@ -14,7 +14,7 @@ jobs:
          - ubuntu-latest
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - name: env
      run: |
       pwd
--- a/.github/workflows/build-watcom.yml
+++ b/.github/workflows/build-watcom.yml
@ -14,7 +14,7 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: Setup Open Watcom
@ -25,14 +25,13 @@ jobs:
       echo "now: $NOW"
       $RELEASE = Get-Content -Path "RELEASE" -Raw
       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "VERSION=/D `"VERSION=\`"3proxy-$RELEASE\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D `"BUILDDATE=\`"$NOW\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: make Watcom
      shell: cmd
      run: |
-       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
       nmake /F Makefile.watcom
    - name: make dist dir
      shell: cmd
--- a/.github/workflows/build-win32.yml
+++ b/.github/workflows/build-win32.yml
@ -14,19 +14,16 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: set date
      run: |
       $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
       $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "VERSION=/D `"VERSION=\`"3proxy-$RELEASE\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D `"BUILDDATE=\`"$NOW\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: install packages
      run: vcpkg install pcre2:x86-windows-static openssl:x86-windows-static
    - name: Add msbuild to PATH
@ -40,7 +37,7 @@ jobs:
       cd "D:/a/3proxy/3proxy"
       set "LIB=%LIB%;c:/vcpkg/installed/x86-windows-static/lib"
       set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x86-windows-static/include"
-       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
       nmake /F Makefile.msvc
    - name: make dist dir
      shell: cmd
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@ -14,19 +14,17 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: set date
      run: |
       $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
       $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "VERSION=/D `"VERSION=\`"3proxy-$RELEASE\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D `"BUILDDATE=\`"$NOW\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: install packages
      run: vcpkg install pcre2:x64-windows-static openssl:x64-windows-static
    - name: Add msbuild to PATH
@ -40,7 +38,8 @@ jobs:
       cd "D:/a/3proxy/3proxy"
       set "LIB=%LIB%;c:/vcpkg/installed/x64-windows-static/lib"
       set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x64-windows-static/include"
-       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       echo %NOW% / %RELEASE% / %BUILDDATE% / %VERSION%
       nmake /F Makefile.msvc
    - name: make dist dir
      shell: cmd
--- a/.github/workflows/build-winarm64.yml
+++ b/.github/workflows/build-winarm64.yml
@ -14,19 +14,16 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: set date
      run: |
       $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
       $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "VERSION=/D `"VERSION=\`"3proxy-$RELEASE\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D `"BUILDDATE=\`"$NOW\`"`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: install packages
      run: vcpkg install pcre2:arm64-windows-static openssl:arm64-windows-static
    - name: Add msbuild to PATH
@ -40,7 +37,7 @@ jobs:
       cd "D:/a/3proxy/3proxy"
       set "LIB=%LIB%;c:/vcpkg/installed/arm64-windows-static/lib"
       set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/arm64-windows-static/include"
-       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
       nmake /F Makefile.msvc
    - name: make dist dir
      shell: cmd
--- a/.github/workflows/c-cpp-Linux.yml
+++ b/.github/workflows/c-cpp-Linux.yml
@ -18,7 +18,7 @@ jobs:
          - ubuntu-24.04-arm
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: Linux libraries
--- a/.github/workflows/c-cpp-MacOS.yml
+++ b/.github/workflows/c-cpp-MacOS.yml
@ -17,7 +17,7 @@ jobs:
          - macos-15
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: Mac libraries
--- a/.github/workflows/c-cpp-Windows.yml
+++ b/.github/workflows/c-cpp-Windows.yml
@ -17,7 +17,7 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - name: install Windows libraries
      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
--- a/.github/workflows/c-cpp-cmake.yml
+++ b/.github/workflows/c-cpp-cmake.yml
@ -20,7 +20,7 @@ jobs:
          - windows-2022
    runs-on: ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 #    - name: configure
 #      run: ./configure
    - name: Linux libraries
--- a/Makefile.msvc
+++ b/Makefile.msvc
@ -6,13 +6,9 @@

 BUILDDIR = ../bin/
 CC = cl
-CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC"  /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "PRIx64=\"I64x\"" /Fp"proxy.pch" /FD /c
-!IFDEF RELEASE
-VERSION=/D VERSION=\"3proxy-$(RELEASE)\"
-!ENDIF
-!IFDEF NOW
-BUILDDATE=/D BUILDDATE=\"$(NOW)\"
-!ENDIF
+VERSION = $(VERSION)
+BUILDDATE = $(BUILDDATE)
+CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC"  /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c $(BUILDDATE) $(VERSION) 
 COUT = /Fo
 LN = link
 LDFLAGS =  /nologo /subsystem:console /incremental:no
@ -33,9 +29,7 @@ COMPATLIBS =
 MAKEFILE = Makefile.msvc
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin FilePlugin SSLPlugin PCREPlugin
 VERFILE = 3proxy.res $(VERFILE)
-VERSION = $(VERSION)
 VERSIONDEP = 3proxy.res $(VERSIONDEP)
-BUILDDATE = $(BUILDDATE)
 AFTERCLEAN = if exist src\*.res (del src\*.res) && if exist src\*.err (del src\*.err)

 include Makefile.inc
--- a/Makefile.watcom
+++ b/Makefile.watcom
@ -6,7 +6,7 @@

 BUILDDIR = ../bin/
 CC = cl
-CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NOODBC" /D "NORADIUS" /D"WATCOM" /D "MSVC"  /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "PRIx64=\"I64x\"" /c $(VERSION) $(BUILDDATE)
+CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NOODBC" /D "NORADIUS" /D"WATCOM" /D "MSVC"  /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "SCNx64=\"I64x\"" /D "SCNd64=\"I64d\"" /D "PRIx64=\"I64x\"" /c $(VERSION) $(BUILDDATE)
 COUT = /Fo
 LN = link
 LDFLAGS = /nologo /subsystem:console /incremental:no 
@ -62,9 +62,3 @@ allplugins:
 	nmake
 	del *.obj *.idb
 	cd ../../
-	copy Makefile plugins\PCREPlugin
-	copy Makefile.var plugins\PCREPlugin
-	cd plugins\PCREPlugin
-	nmake
-	del *.obj *.idb
-	cd ../../
--- a/doc/html/howtoe.html
+++ b/doc/html/howtoe.html
@ -67,14 +67,10 @@
 	<ul>
 		<li><A NAME="MSVC">How to compile 3proxy with Visual C++</A>
 <p>
-Extract source code files from 3proxy.tgz (with WinZip or another utility).
-For 64-bit Windows use:
+Extract source code files from 3proxy.tgz (with WinZip or another utility) or use git.
+
 <pre>
-nmake /f Makefile.msvc64
-</pre>
-For ARM64 Windows use:
-<pre>
-nmake /f Makefile.msvcARM64
+nmake /f Makefile.msvc
 </pre>
 Binaries will be placed in the <code>bin/</code> directory.
 </p>
--- a/doc/html/howtor.html
+++ b/doc/html/howtor.html
@ -73,13 +73,10 @@
  <ul>
    <li><a name="MSVC"><i>Как скомпилировать 3proxy Visual C++</i></a>
    <p>
-    Извлеките файлы из архива 3proxy.tgz (например, с помощью WinZip).
-    Для 64-битной Windows используйте:
+    Извлеките файлы из архива 3proxy.tgz (например, с помощью WinZip) или используйте git.
    <pre>
-    nmake /f Makefile.msvc64</pre>
-    Для Windows ARM64 используйте:
-    <pre>
-    nmake /f Makefile.msvcARM64</pre>
+    nmake /f Makefile.msvc
+    </pre>
    Исполняемые файлы будут помещены в каталог <code>bin/</code>.
    </p>
    <li><a name="CMAKE"><i>Как скомпилировать 3proxy с помощью CMake</i></a>