Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add openssl3 support for msvc build #471

Merged
merged 1 commit into from
Feb 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@ jobs:
strategy:
matrix:
arch: [x86, amd64, amd64_arm64]
ossl: [openssl, openssl3]
include:
- arch: amd64_arm64
triplet: arm64
- arch: x86
triplet: x86
- arch: amd64
triplet: x64

env:
# Indicates the location of the vcpkg as a Git submodule of the project repository.
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
SOLUTION_FILE_PATH: .
BUILD_CONFIGURATION: Release
buildDir: '${{ github.workspace }}/build'
VCPKG_OVERLAY_PORTS: '${{ github.workspace }}/openvpn/contrib/vcpkg-ports'
buildDir: '${{ github.workspace }}/build/'

runs-on: windows-latest
steps:
Expand All @@ -23,23 +32,30 @@ jobs:
with:
arch: ${{ matrix.arch }}

- name: Restore from cache and install vcpkg
uses: lukka/run-vcpkg@v6
- name: Clone openvpn repo
uses: actions/checkout@v2
with:
setupOnly: true
vcpkgGitCommitId: 'a267ab118c09f56f3dae96c9a4b3410820ad2f0b'
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
appendedCacheKey: ${{ matrix.arch }}-${{ hashFiles( '**/vcpkg.json' ) }}
repository: openvpn/openvpn
path: openvpn

- 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
with:
useVcpkgToolchainFile: true
buildWithCMake: true
buildDirectory: ${{ env.buildDir }}
cmakeBuildType: ${{env.BUILD_CONFIGURATION}}
buildDirectory: ${{ env.buildDir }}

- uses: actions/upload-artifact@v2
with:
name: openvpn-gui ${{ matrix.arch }}
path: '${{ env.buildDir }}/openvpn-gui.exe'
name: openvpn-gui_${{ matrix.triplet }}_${{ matrix.ossl }}
path: |
${{ env.buildDir }}/*.exe
${{ env.buildDir }}/*.dll
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
cmake_minimum_required(VERSION 3.10)

set(VCPKG_FEATURE_FLAGS manifests)

project(openvpn-gui C)

add_executable(${PROJECT_NAME} WIN32
Expand Down
7 changes: 0 additions & 7 deletions vcpkg.json

This file was deleted.