From 5afc89ab747cfc8ad6b391f17dca61661e9b9df3 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 19 Mar 2024 16:44:56 +0100 Subject: [PATCH] GHA: general update March 2024 - 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 Acked-by: Arne Schwabe Message-Id: <20240319154456.2967716-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28422.html Signed-off-by: Gert Doering (cherry picked from commit 36ff5cdb45183c13b0cb084b288b237ad55345cd) --- .github/workflows/build.yaml | 32 ++++++++++++++--------------- .github/workflows/coverity-scan.yml | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2f68a2b87..b25921235 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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,7 +64,7 @@ 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: | @@ -72,7 +72,7 @@ jobs: ${{ 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 openssl@1.1 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 diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index c10793327..e289746da 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Check submission cache id: check_submit - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: | cov-int @@ -22,7 +22,7 @@ jobs: - name: Checkout OpenVPN if: steps.check_submit.outputs.cache-hit != 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Coverity Build Tool if: steps.check_submit.outputs.cache-hit != 'true' @@ -62,7 +62,7 @@ jobs: - name: Cache submission if: steps.check_submit.outputs.cache-hit != 'true' - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: | cov-int -- 2.47.3