Improve CI

This commit is contained in:
Lynix 2022-03-19 14:19:32 +01:00
parent 75f0e24bf8
commit b97f1a4c41
5 changed files with 22 additions and 30 deletions

View File

@ -29,14 +29,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Install Nazara dependencies # Install system dependencies
- name: Update apt repositories
run: sudo apt-get update
# Install Nazara dependencies
- name: Install system dependencies - name: Install system dependencies
run: | 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) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
@ -62,11 +59,11 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages 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 # Setup compilation mode and install project dependencies
- name: Configure xmake and install 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 # Build the engine
- name: Build Nazara - name: Build Nazara

View File

@ -28,15 +28,12 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Install Nazara dependencies # Install system dependencies
- name: Update apt repositories
run: sudo apt-get update
# Install Nazara dependencies
- name: Install system dependencies - name: Install system dependencies
run: | 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 update
sudo apt-get install libunwind-dev binutils-dev clang-11 -y 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 # Install Honggfuzz
- name: Build and install Hongfuzz - name: Build and install Hongfuzz
@ -71,15 +68,15 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages 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 # Setup compilation mode and install project dependencies
- name: Configure xmake and install 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 # Configure xmake with honggfuzz to build the engine
- name: Configure xmake with honggfuzz - 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 # Build the engine
- name: Build Nazara - name: Build Nazara

View File

@ -29,13 +29,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Install Nazara dependencies # Install system dependencies
- name: Update apt repositories
run: sudo apt-get update
# Install Nazara dependencies
- name: 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) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
@ -61,11 +59,11 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages 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 # Setup compilation mode and install project dependencies
- name: Configure xmake and install 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 # Build the engine
- name: Build Nazara - name: Build Nazara

View File

@ -70,11 +70,11 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages 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 # Setup compilation mode and install project dependencies
- name: Configure xmake and install 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 # Build the engine
- name: Build Nazara - name: Build Nazara

View File

@ -53,11 +53,11 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages 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 # Setup compilation mode and install project dependencies
- name: Configure xmake and install 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 # Build the engine
- name: Build Nazara - name: Build Nazara