From b97f1a4c41d901c921f82ae90d37515e49aab88a Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 19 Mar 2022 14:19:32 +0100 Subject: [PATCH] Improve CI --- .github/workflows/coverage.yml | 13 +++++-------- .github/workflows/linux-build-sanitizer.yml | 17 +++++++---------- .github/workflows/linux-build.yml | 14 ++++++-------- .github/workflows/msys2-build.yml | 4 ++-- .github/workflows/windows-build.yml | 4 ++-- 5 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f5373358e..748bfc058 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,14 +29,11 @@ jobs: steps: - uses: actions/checkout@v2 - # Install Nazara dependencies - - name: Update apt repositories - run: sudo apt-get update - - # Install Nazara dependencies + # Install system dependencies - name: Install system dependencies run: | - sudo apt-get -y install libsndfile1-dev libfreetype6-dev libsdl2-dev mesa-common-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev git gcovr + sudo apt-get update + sudo apt-get -y install mesa-common-dev libwayland-dev uuid-dev gcovr # Force xmake to a specific folder (for cache) - name: Set xmake env @@ -62,11 +59,11 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r3 + key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r4 # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --verbose --yes + run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes # Build the engine - name: Build Nazara diff --git a/.github/workflows/linux-build-sanitizer.yml b/.github/workflows/linux-build-sanitizer.yml index 2ada09d3c..b9b847093 100644 --- a/.github/workflows/linux-build-sanitizer.yml +++ b/.github/workflows/linux-build-sanitizer.yml @@ -28,15 +28,12 @@ jobs: steps: - uses: actions/checkout@v2 - # Install Nazara dependencies - - name: Update apt repositories - run: sudo apt-get update - - # Install Nazara dependencies + # Install system dependencies - name: Install system dependencies run: | - sudo apt-get install libsndfile1-dev libfreetype6-dev libsdl2-dev mesa-common-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev libgl1-mesa-dev git -y - sudo apt-get install libunwind-dev binutils-dev clang-11 -y + sudo apt-get update + sudo apt-get -y install mesa-common-dev libwayland-dev uuid-dev + sudo apt-get -y install libunwind-dev binutils-dev clang-11 # Install Honggfuzz - name: Build and install Hongfuzz @@ -71,15 +68,15 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r3 + key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r4 # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --shadernodes=y --tests=y --arch=${{ matrix.arch }} --mode=fuzz --verbose --yes + run: xmake config --shadernodes=y --tests=y --arch=${{ matrix.arch }} --mode=fuzz --yes # Configure xmake with honggfuzz to build the engine - name: Configure xmake with honggfuzz - run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=fuzz --verbose --toolchain=hfuzz-clang + run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=fuzz --toolchain=hfuzz-clang # Build the engine - name: Build Nazara diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 6087cf8b5..e61ab1275 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -29,13 +29,11 @@ jobs: steps: - uses: actions/checkout@v2 - # Install Nazara dependencies - - name: Update apt repositories - run: sudo apt-get update - - # Install Nazara dependencies + # Install system dependencies - name: Install system dependencies - run: sudo apt-get install libsndfile1-dev libfreetype6-dev libsdl2-dev mesa-common-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev libgl1-mesa-dev -y + run: | + sudo apt-get update + sudo apt-get -y install mesa-common-dev libwayland-dev uuid-dev # Force xmake to a specific folder (for cache) - name: Set xmake env @@ -61,11 +59,11 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r3 + key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r4 # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --verbose --yes + run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes # Build the engine - name: Build Nazara diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index 420f1e111..999b9b1b3 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -70,11 +70,11 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages - key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r3 + key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r4 # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --verbose --yes + run: xmake config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes # Build the engine - name: Build Nazara diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 157cf037a..37e7e6444 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -53,11 +53,11 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages - key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r3 + key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r4 # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake.exe config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --verbose --yes + run: xmake.exe config --shadernodes=y --tests=y --unitybuild=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes # Build the engine - name: Build Nazara