From 5fff0e002e879baedcdd81877984be79cb7718f3 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Tue, 16 Aug 2022 23:13:37 -0500 Subject: [PATCH] workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3 This should also fix #247 --- .github/workflows/cmake.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 74eb43024..cc6024753 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,26 +15,40 @@ jobs: fail-fast: false matrix: arch: [x64] - os: [ubuntu-18.04, ubuntu-latest] + os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04] compiler: [gcc, clang] runs-on: ${{ matrix.os }} + env: + MATRIX_OS: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get dependencies run: | sudo apt update - sudo mk/linux/setupBuildDeps.sh - - - name: Bulid MegaGlest With GCC Compiler + if [ "${MATRIX_OS}" != "ubuntu-22.04" ]; then + sudo mk/linux/setupBuildDeps.sh + else + sudo apt-get install build-essential cmake \ + libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev \ + libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev \ + libcppunit-dev libfribidi-dev libftgl-dev libglew-dev \ + libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev \ + libvlc-dev libvlccore-dev libxml2-dev libx11-dev \ + libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev \ + libldap2-dev libidn2-0-dev libpsl-dev libgnutls28-dev \ + libnghttp2-dev libssh2-1-dev + fi + + - name: Build MegaGlest With GCC Compiler if: ${{ matrix.compiler == 'gcc' }} env: CC: gcc CXX: g++ run: mk/linux/build-mg.sh - - name: Bulid MegaGlest With Clang Compiler + - name: Build MegaGlest With Clang Compiler if: ${{ matrix.compiler == 'clang' }} env: CC: clang @@ -75,7 +89,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache Vcpkg Libs uses: actions/cache@v2