mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-26 19:39:53 +03:00
Compare commits
No commits in common. "cd86bd810d3e7baccc2009f7e4fb3de7fb568b1e" and "5cf45ad62bd3b5ad5a4978ef06246f293dc6ecd1" have entirely different histories.
cd86bd810d
...
5cf45ad62b
15
.ci/azure-pipelines/linux_build.sh
Executable file
15
.ci/azure-pipelines/linux_build.sh
Executable file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ "${#SE_BUILD_NUMBER_TOKEN}" -eq 64 ]]; then
|
||||||
|
VERSION=$(python3 "version.py")
|
||||||
|
BUILD_NUMBER=$(curl "https://softether.network/get-build-number?commit=${BUILD_SOURCEVERSION}&version=${VERSION}&token=${SE_BUILD_NUMBER_TOKEN}")
|
||||||
|
else
|
||||||
|
BUILD_NUMBER=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd ${BUILD_BINARIESDIRECTORY}
|
||||||
|
|
||||||
|
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_NUMBER=${BUILD_NUMBER} ${BUILD_SOURCESDIRECTORY}
|
||||||
|
cmake --build .
|
||||||
|
|
||||||
|
cpack -C Release -G DEB
|
13
.ci/azure-pipelines/macos_build.sh
Executable file
13
.ci/azure-pipelines/macos_build.sh
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ "${#SE_BUILD_NUMBER_TOKEN}" -eq 64 ]]; then
|
||||||
|
VERSION=$(python3 "version.py")
|
||||||
|
BUILD_NUMBER=$(curl "https://softether.network/get-build-number?commit=${BUILD_SOURCEVERSION}&version=${VERSION}&token=${SE_BUILD_NUMBER_TOKEN}")
|
||||||
|
else
|
||||||
|
BUILD_NUMBER=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd ${BUILD_BINARIESDIRECTORY}
|
||||||
|
|
||||||
|
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_NUMBER=${BUILD_NUMBER} -DOPENSSL_ROOT_DIR="/usr/local/opt/openssl" ${BUILD_SOURCESDIRECTORY}
|
||||||
|
cmake --build .
|
33
.ci/azure-pipelines/windows_build.bat
Normal file
33
.ci/azure-pipelines/windows_build.bat
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
@echo on
|
||||||
|
|
||||||
|
:: The method we use to store a command's output into a variable:
|
||||||
|
:: https://stackoverflow.com/a/6362922
|
||||||
|
for /f "tokens=* USEBACKQ" %%g in (`python "version.py"`) do (set "VERSION=%%g")
|
||||||
|
|
||||||
|
:: https://stackoverflow.com/a/8566001
|
||||||
|
echo %SE_BUILD_NUMBER_TOKEN%> "%tmp%\length.txt"
|
||||||
|
for %%? in ("%tmp%\length.txt") do ( set /A SE_BUILD_NUMBER_TOKEN_LENGTH=%%~z? - 2 )
|
||||||
|
|
||||||
|
if %SE_BUILD_NUMBER_TOKEN_LENGTH% equ 64 (
|
||||||
|
for /f "tokens=* USEBACKQ" %%g in (`curl "https://softether.network/get-build-number?commit=%BUILD_SOURCEVERSION%&version=%VERSION%&token=%SE_BUILD_NUMBER_TOKEN%"`) do (set "BUILD_NUMBER=%%g")
|
||||||
|
) else (
|
||||||
|
set BUILD_NUMBER=0
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if "%BUILD_BINARIESDIRECTORY%"=="" (set BUILD_BINARIESDIRECTORY=build)
|
||||||
|
if "%BUILD_SOURCESDIRECTORY%"=="" (set BUILD_SOURCESDIRECTORY=%cd%)
|
||||||
|
|
||||||
|
if not exist %BUILD_BINARIESDIRECTORY% mkdir %BUILD_BINARIESDIRECTORY%
|
||||||
|
|
||||||
|
cd %BUILD_BINARIESDIRECTORY%
|
||||||
|
|
||||||
|
call "%VCVARS_PATH%"
|
||||||
|
|
||||||
|
cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="%COMPILER_PATH%" -DCMAKE_CXX_COMPILER="%COMPILER_PATH%" -DBUILD_NUMBER=%BUILD_NUMBER% "%BUILD_SOURCESDIRECTORY%"
|
||||||
|
cmake --build .
|
||||||
|
|
||||||
|
if "%BUILD_STAGINGDIRECTORY%"=="" (set BUILD_STAGINGDIRECTORY=%cd%)
|
||||||
|
mkdir "%BUILD_STAGINGDIRECTORY%\installers"
|
||||||
|
vpnsetup /SFXMODE:vpnclient /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
||||||
|
vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
17
.github/workflows/windows.yml
vendored
17
.github/workflows/windows.yml
vendored
@ -22,28 +22,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
path: 'build/vcpkg_installed/'
|
path: 'build/vcpkg_installed/'
|
||||||
key: vcpkg-${{ matrix.platform.VCPKG_TRIPLET }}
|
key: vcpkg-${{ matrix.platform.VCPKG_TRIPLET }}
|
||||||
- name: Set version variables
|
|
||||||
run: |
|
|
||||||
$v = python version.py
|
|
||||||
echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
|
|
||||||
shell: pwsh
|
|
||||||
- name: Build
|
- name: Build
|
||||||
env:
|
env:
|
||||||
ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
|
ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
|
||||||
COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
|
COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
|
||||||
VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
|
VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
|
||||||
VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
|
VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
|
||||||
run: |
|
run: .ci/azure-pipelines/windows_build.bat
|
||||||
set BUILD_NUMBER=0
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
call "%VCVARS_PATH%"
|
|
||||||
cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="%COMPILER_PATH%" -DCMAKE_CXX_COMPILER="%COMPILER_PATH%" -DBUILD_NUMBER=%BUILD_NUMBER% ..
|
|
||||||
cmake --build .
|
|
||||||
mkdir installers
|
|
||||||
vpnsetup /SFXMODE:vpnclient /SFXOUT:"installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
|
||||||
vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
|
||||||
shell: cmd
|
|
||||||
- name: Test
|
- name: Test
|
||||||
shell: powershell
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
|
94
.github/workflows/windows_release.yml
vendored
94
.github/workflows/windows_release.yml
vendored
@ -1,94 +0,0 @@
|
|||||||
name: "Release"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: windows-latest
|
|
||||||
outputs:
|
|
||||||
upload_url: "${{ steps.create_release.outputs.upload_url }}"
|
|
||||||
steps:
|
|
||||||
- name: "Checkout repository"
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: "Create GitHub release"
|
|
||||||
id: create_release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
build-windows:
|
|
||||||
name: ${{ matrix.platform.ARCHITECTURE }}
|
|
||||||
runs-on: windows-latest
|
|
||||||
needs: ["release"]
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
platform: [
|
|
||||||
{ ARCHITECTURE: x86, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe", VCPKG_TRIPLET: "x86-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"},
|
|
||||||
{ ARCHITECTURE: x64, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe", VCPKG_TRIPLET: "x64-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"}
|
|
||||||
]
|
|
||||||
steps:
|
|
||||||
- name: "Checkout repository"
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
submodules: true
|
|
||||||
- name: Cache vcpkg
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: 'build/vcpkg_installed/'
|
|
||||||
key: vcpkg-release-${{ matrix.platform.VCPKG_TRIPLET }}
|
|
||||||
- name: Set version variables
|
|
||||||
run: |
|
|
||||||
$b=(Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber
|
|
||||||
echo "BUILD_NUMBER=$b" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
|
|
||||||
$v = python version.py
|
|
||||||
echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
|
|
||||||
shell: pwsh
|
|
||||||
- name: Build
|
|
||||||
env:
|
|
||||||
ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
|
|
||||||
COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
|
|
||||||
VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
|
|
||||||
VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
|
|
||||||
run: |
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
call "%VCVARS_PATH%"
|
|
||||||
cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="%COMPILER_PATH%" -DCMAKE_CXX_COMPILER="%COMPILER_PATH%" -DBUILD_NUMBER=%BUILD_NUMBER% ..
|
|
||||||
cmake --build .
|
|
||||||
mkdir installers
|
|
||||||
vpnsetup /SFXMODE:vpnclient /SFXOUT:"installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
|
||||||
vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
|
||||||
shell: cmd
|
|
||||||
|
|
||||||
- name: dir
|
|
||||||
run: |
|
|
||||||
Get-ChildItem -Recurse build/installers
|
|
||||||
shell: pwsh
|
|
||||||
|
|
||||||
- name: "Upload softether-vpnclient"
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: "${{ github.token }}"
|
|
||||||
with:
|
|
||||||
upload_url: "${{ needs.release.outputs.upload_url }}"
|
|
||||||
asset_path: "build/installers/softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
|
|
||||||
asset_name: "softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
|
|
||||||
asset_content_type: "application/octet-stream"
|
|
||||||
- name: "Upload softether-vpnserver_vpnbridge"
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: "${{ github.token }}"
|
|
||||||
with:
|
|
||||||
upload_url: "${{ needs.release.outputs.upload_url }}"
|
|
||||||
asset_path: "build/installers/softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
|
|
||||||
asset_name: "softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
|
|
||||||
asset_content_type: "application/octet-stream"
|
|
||||||
|
|
@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
||Badges|
|
||Badges|
|
||||||
|---|---|
|
|---|---|
|
||||||
|
|AppVeyor|[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/softethervpn/softethervpn?branch=master&svg=true)](https://ci.appveyor.com/project/softethervpn/softethervpn) |
|
||||||
|GitLab CI|[![GitLab CI build status](https://gitlab.com/SoftEther/SoftEtherVPN/badges/master/pipeline.svg)](https://gitlab.com/SoftEther/SoftEtherVPN/pipelines)|
|
|GitLab CI|[![GitLab CI build status](https://gitlab.com/SoftEther/SoftEtherVPN/badges/master/pipeline.svg)](https://gitlab.com/SoftEther/SoftEtherVPN/pipelines)|
|
||||||
|Coverity Scan|[![Coverity Scan build status](https://scan.coverity.com/projects/16304/badge.svg)](https://scan.coverity.com/projects/softethervpn-softethervpn)|
|
|Coverity Scan|[![Coverity Scan build status](https://scan.coverity.com/projects/16304/badge.svg)](https://scan.coverity.com/projects/softethervpn-softethervpn)|
|
||||||
|
|Azure Pipelines|[![Azure Pipelines build status for Nightly](https://dev.azure.com/SoftEther-VPN/SoftEther%20VPN/_apis/build/status/6?api-version=6.0-preview.1)](https://dev.azure.com/SoftEther-VPN/SoftEther%20VPN/_build?definitionId=6)|
|
||||||
|Cirrus CI|[![Cirrus CI build status](https://api.cirrus-ci.com/github/SoftEtherVPN/SoftEtherVPN.svg)](https://cirrus-ci.com/github/SoftEtherVPN/SoftEtherVPN)|
|
|Cirrus CI|[![Cirrus CI build status](https://api.cirrus-ci.com/github/SoftEtherVPN/SoftEtherVPN.svg)](https://cirrus-ci.com/github/SoftEtherVPN/SoftEtherVPN)|
|
||||||
|
|
||||||
- [SoftEther VPN](#softether-vpn)
|
- [SoftEther VPN](#softether-vpn)
|
||||||
|
Loading…
Reference in New Issue
Block a user