diff --git a/.github/workflows/build_openvpn_android.yml b/.github/workflows/build_openvpn_android.yml index 13e969c..80cca9a 100644 --- a/.github/workflows/build_openvpn_android.yml +++ b/.github/workflows/build_openvpn_android.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v3 with: repository: amnezia-vpn/openvpn-pt-android - ref: master + ref: update-ovpn3 path: openvpn-pt-android - name: 'Build Android OpenVPN binary' diff --git a/.github/workflows/build_openvpn_linux.yml b/.github/workflows/build_openvpn_linux.yml index 4bd8f9c..7e49ae9 100644 --- a/.github/workflows/build_openvpn_linux.yml +++ b/.github/workflows/build_openvpn_linux.yml @@ -22,7 +22,7 @@ jobs: UBSAN_OPTIONS: print_stacktrace=1 BUILD_DIR: ${{ github.workspace }}/../_deps/openvpn_build INSTALL_DIR: ${{ github.workspace }}/../openvpn_inst - OPEN_SSL_VER: "1.1.1t" + OPEN_SSL_VER: "3.0.13" _ARCH: ${{matrix.arch}} OPENSSL_LIBS: "-L${INSTALL_DIR}/lib -lssl -lcrypto" OPENSSL_CFLAGS: "-I${INSTALL_DIR}/include" diff --git a/.github/workflows/build_openvpn_macos.yml b/.github/workflows/build_openvpn_macos.yml index 6ea5f71..89bd6af 100644 --- a/.github/workflows/build_openvpn_macos.yml +++ b/.github/workflows/build_openvpn_macos.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ssllib: [ openssl11 ] + ssllib: [ openssl30 ] build: [ normal, asan ] os: [macos-11, macos-12] arch: [x86_64] #, arm64] @@ -22,11 +22,10 @@ jobs: cflags: "-O2 -g" ldflags: "" configureflags: "" - - ssllib: openssl11 - libdir: openssl@1.1 + - ssllib: openssl30 + libdir: openssl@3.0 configuressllib: "" - runs-on: ${{matrix.os}} if: | contains(github.event.head_commit.message, '[all]') || @@ -41,7 +40,7 @@ jobs: UBSAN_OPTIONS: print_stacktrace=1 BUILD_DIR: ${{ github.workspace }}/../_deps/openvpn_build INSTALL_DIR: ${{ github.workspace }}/../openvpn_inst - OPEN_SSL_VER: "1.1.1t" + OPEN_SSL_VER: "3.0.13" _ARCH: ${{matrix.arch}} OPENSSL_LIBS: "-L${INSTALL_DIR}/lib -lssl -lcrypto" OPENSSL_CFLAGS: "-I${INSTALL_DIR}include" @@ -159,7 +158,7 @@ jobs: name: "${{matrix.os}} - ${{matrix.arch}}" env: BUILD_DIR: ${{ github.workspace }}/build - OPEN_SSL_VER: "1.1.1t" + OPEN_SSL_VER: "3.0.13" steps: - name: Install dependencies diff --git a/.github/workflows/build_openvpn_windows.yml b/.github/workflows/build_openvpn_windows.yml index 7cf9209..ac46049 100644 --- a/.github/workflows/build_openvpn_windows.yml +++ b/.github/workflows/build_openvpn_windows.yml @@ -23,7 +23,7 @@ jobs: VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/openvpn/contrib/vcpkg-ports VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/openvpn/contrib/vcpkg-triplets - runs-on: windows-latest + runs-on: windows-2019 if: | contains(github.event.head_commit.message, '[all]') || contains(github.event.head_commit.message, '[windows]') || @@ -40,7 +40,7 @@ jobs: ref: release/2.5 path: openvpn - - name: Add MSBuild to PATH + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 - name: Set up Python @@ -51,12 +51,16 @@ jobs: - name: Install rst2html run: python -m pip install --upgrade pip rst2html - - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@v10 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 + - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 with: - vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' - vcpkgJsonGlob: '**/openvpn/vcpkg.json' - appendedCacheKey: '${{matrix.triplet}}' + arch: ${{ matrix.arch }} + + - name: Restore from cache and install vcpkg + uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 + with: + vcpkgGitCommitId: 8b04a7bd93bef991818fc372bb83ce00ec1c1c16 + vcpkgJsonGlob: '**/windows/vcpkg.json' - name: Run MSBuild consuming vcpkg.json working-directory: openvpn