From 900947bd0869b8167a9159ce2be72d9c4f98c673 Mon Sep 17 00:00:00 2001 From: Yihong Wu <54519668+domosekai@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:13:37 +0800 Subject: [PATCH] Use vcpkg manifest and pin to OpenSSL 1.1.1 --- .ci/azure-pipelines/windows-steps.yml | 8 ++------ vcpkg.json | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 vcpkg.json diff --git a/.ci/azure-pipelines/windows-steps.yml b/.ci/azure-pipelines/windows-steps.yml index 8e9168d3..326a9df7 100644 --- a/.ci/azure-pipelines/windows-steps.yml +++ b/.ci/azure-pipelines/windows-steps.yml @@ -11,13 +11,9 @@ parameters: steps: - task: Cache@2 inputs: - key: '"vcpkg-installed-windows-${{parameters.architecture}}"' - path: 'C:/vcpkg/installed' + key: '"vcpkg-manifest" | "$(Agent.OS)" | "${{parameters.vcpkgTriplet}}" | C:/vcpkg/.git/refs/heads/master' + path: '$(Build.BinariesDirectory)/vcpkg_installed' displayName: 'Environment storage' -- script: | - vcpkg install libsodium openssl zlib --triplet ${{parameters.vcpkgTriplet}} - workingDirectory: C:/vcpkg - displayName: 'Prepare environment' - script: '$(Build.SourcesDirectory)/.ci/azure-pipelines/windows_build.bat' env: ARCHITECTURE: ${{parameters.architecture}} diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..60a28e22 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "softether-vpn", + "version-string": "5.02", + "dependencies": [ + "libsodium", + "openssl", + "zlib" + ], + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ], + "builtin-baseline": "f6af75acc923c833a5620943e3fc7d5e4930f0df" +} \ No newline at end of file