mirror of https://github.com/OpenVPN/openvpn-gui
Add openssl3 support for msvc build
- remove vcpkg manifest and use whatever openssl version is installed. To build with openssl3, one could use openssl3 port from openvpn/contrib/vcpkg-ports. - build with openssl1.1.1 and openssl3 in GitHub Actions Signed-off-by: Lev Stipakov <lev@openvpn.net>pull/477/head
parent
cd4748fb25
commit
d27fd21222
|
@ -7,13 +7,22 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x86, amd64, amd64_arm64]
|
arch: [x86, amd64, amd64_arm64]
|
||||||
|
ossl: [openssl, openssl3]
|
||||||
|
include:
|
||||||
|
- arch: amd64_arm64
|
||||||
|
triplet: arm64
|
||||||
|
- arch: x86
|
||||||
|
triplet: x86
|
||||||
|
- arch: amd64
|
||||||
|
triplet: x64
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Indicates the location of the vcpkg as a Git submodule of the project repository.
|
# Indicates the location of the vcpkg as a Git submodule of the project repository.
|
||||||
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
|
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
|
||||||
SOLUTION_FILE_PATH: .
|
SOLUTION_FILE_PATH: .
|
||||||
BUILD_CONFIGURATION: Release
|
BUILD_CONFIGURATION: Release
|
||||||
buildDir: '${{ github.workspace }}/build'
|
VCPKG_OVERLAY_PORTS: '${{ github.workspace }}/openvpn/contrib/vcpkg-ports'
|
||||||
|
buildDir: '${{ github.workspace }}/build/'
|
||||||
|
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
|
@ -23,23 +32,30 @@ jobs:
|
||||||
with:
|
with:
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
|
|
||||||
- name: Restore from cache and install vcpkg
|
- name: Clone openvpn repo
|
||||||
uses: lukka/run-vcpkg@v6
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
setupOnly: true
|
repository: openvpn/openvpn
|
||||||
vcpkgGitCommitId: 'a267ab118c09f56f3dae96c9a4b3410820ad2f0b'
|
path: openvpn
|
||||||
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
|
|
||||||
appendedCacheKey: ${{ matrix.arch }}-${{ hashFiles( '**/vcpkg.json' ) }}
|
|
||||||
|
|
||||||
- name: Run CMake with vcpkg.json manifest
|
- name: Install dependencies
|
||||||
|
uses: lukka/run-vcpkg@v7.4
|
||||||
|
with:
|
||||||
|
vcpkgGitCommitId: 'b18b17865cfb6bd24620a00f30691be6775abb96'
|
||||||
|
vcpkgArguments: ${{ matrix.ossl }}
|
||||||
|
vcpkgTriplet: '${{ matrix.triplet }}-windows'
|
||||||
|
|
||||||
|
- name: Build
|
||||||
uses: lukka/run-cmake@v3
|
uses: lukka/run-cmake@v3
|
||||||
with:
|
with:
|
||||||
useVcpkgToolchainFile: true
|
useVcpkgToolchainFile: true
|
||||||
buildWithCMake: true
|
buildWithCMake: true
|
||||||
buildDirectory: ${{ env.buildDir }}
|
|
||||||
cmakeBuildType: ${{env.BUILD_CONFIGURATION}}
|
cmakeBuildType: ${{env.BUILD_CONFIGURATION}}
|
||||||
|
buildDirectory: ${{ env.buildDir }}
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: openvpn-gui ${{ matrix.arch }}
|
name: openvpn-gui_${{ matrix.triplet }}_${{ matrix.ossl }}
|
||||||
path: '${{ env.buildDir }}/openvpn-gui.exe'
|
path: |
|
||||||
|
${{ env.buildDir }}/*.exe
|
||||||
|
${{ env.buildDir }}/*.dll
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
|
||||||
set(VCPKG_FEATURE_FLAGS manifests)
|
|
||||||
|
|
||||||
project(openvpn-gui C)
|
project(openvpn-gui C)
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME} WIN32
|
add_executable(${PROJECT_NAME} WIN32
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"name": "openvpn-gui",
|
|
||||||
"version-string": "0.0.1",
|
|
||||||
"dependencies": [
|
|
||||||
"openssl"
|
|
||||||
]
|
|
||||||
}
|
|
Loading…
Reference in New Issue