-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Update to Node 20 versions of actions to avoid warnings - Update to current vcpkg - Update mbedTLS and LibreSSL to latest releases Change-Id: I1ad6a0b1323ce0872f4a3299c5a9f18a982e0126 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Arne Schwabe <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg28422.html Signed-off-by: Gert Doering <[email protected]> (cherry picked from commit 36ff5cd)
- Loading branch information
1 parent
05d321e
commit 5afc89a
Showing
2 changed files
with
19 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ jobs: | |
- name: Install dependencies | ||
run: sudo apt update && sudo apt install -y uncrustify | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
with: | ||
path: openvpn | ||
- name: Show uncrustify version | ||
|
@@ -27,7 +27,7 @@ jobs: | |
- name: Show changes on standard output | ||
run: git diff | ||
working-directory: openvpn | ||
- uses: actions/upload-artifact@v3 | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
name: uncrustify-changes.patch | ||
path: 'openvpn/uncrustify-changes.patch' | ||
|
@@ -49,12 +49,12 @@ jobs: | |
- name: Install dependencies | ||
run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
|
||
- name: Restore from cache and install vcpkg | ||
uses: lukka/run-vcpkg@v11 | ||
with: | ||
vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' | ||
vcpkgGitCommitId: 8d3649ba34aab36914ddd897958599aa0a91b08e | ||
vcpkgJsonGlob: '**/mingw/vcpkg.json' | ||
|
||
- name: Run CMake with vcpkg.json manifest | ||
|
@@ -64,15 +64,15 @@ jobs: | |
buildPreset: mingw-${{ matrix.arch }} | ||
buildPresetAdditionalArgs: "['--config Debug']" | ||
|
||
- uses: actions/upload-artifact@v3 | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
name: openvpn-mingw-${{ matrix.arch }} | ||
path: | | ||
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.exe | ||
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.dll | ||
!${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/test_*.exe | ||
- uses: actions/upload-artifact@v3 | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
name: openvpn-mingw-${{ matrix.arch }}-tests | ||
path: | | ||
|
@@ -91,7 +91,7 @@ jobs: | |
name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL" | ||
steps: | ||
- name: Retrieve mingw unittest | ||
uses: actions/download-artifact@v3 | ||
uses: actions/download-artifact@v4 | ||
with: | ||
name: openvpn-mingw-${{ matrix.arch }}-tests | ||
path: unittests | ||
|
@@ -151,7 +151,7 @@ jobs: | |
- name: Install dependencies | ||
run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG} | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
- name: autoconf | ||
run: autoreconf -fvi | ||
- name: configure | ||
|
@@ -178,7 +178,7 @@ jobs: | |
- name: Install dependencies | ||
run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf libmbedtls-dev | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
- name: autoconf | ||
run: autoreconf -fvi | ||
- name: configure | ||
|
@@ -227,7 +227,7 @@ jobs: | |
- name: Install dependencies | ||
run: brew install [email protected] openssl@3 lzo lz4 man2html cmocka libtool automake autoconf libressl | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
- name: autoconf | ||
run: autoreconf -fvi | ||
- name: configure | ||
|
@@ -249,7 +249,7 @@ jobs: | |
|
||
runs-on: windows-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- uses: lukka/get-cmake@latest | ||
|
||
- name: Install rst2html | ||
|
@@ -258,7 +258,7 @@ jobs: | |
- name: Restore artifacts, or setup vcpkg (do not install any package) | ||
uses: lukka/run-vcpkg@v11 | ||
with: | ||
vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' | ||
vcpkgGitCommitId: 8d3649ba34aab36914ddd897958599aa0a91b08e | ||
vcpkgJsonGlob: '**/windows/vcpkg.json' | ||
|
||
- name: Run CMake with vcpkg.json manifest (NO TESTS) | ||
|
@@ -276,7 +276,7 @@ jobs: | |
buildPreset: win-${{ matrix.arch }}-release | ||
testPreset: win-${{ matrix.arch }}-release | ||
|
||
- uses: actions/upload-artifact@v3 | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
name: openvpn-msvc-${{ matrix.arch }} | ||
path: | | ||
|
@@ -316,11 +316,11 @@ jobs: | |
- name: Install dependencies | ||
run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev | ||
- name: "libressl: checkout" | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
with: | ||
path: libressl | ||
repository: libressl/portable | ||
ref: v3.8.2 | ||
ref: v3.8.3 | ||
- name: "libressl: autogen.sh" | ||
run: ./autogen.sh | ||
working-directory: libressl | ||
|
@@ -336,7 +336,7 @@ jobs: | |
- name: "ldconfig" | ||
run: sudo ldconfig | ||
- name: Checkout OpenVPN | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
- name: autoconf | ||
run: autoreconf -fvi | ||
- name: configure | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters