From dc3e37b8c6c58f2af4912b862a5e51b2fc8b2481 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 28 Jul 2024 20:17:18 +0200 Subject: [PATCH] Change matrix --- .gitea/workflows/build_pc.yml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 4d4ee6f..2da5a0e 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -11,22 +11,12 @@ env: jobs: build: - name: Build desktop - ${{matrix.config.name}} - runs-on: ${{matrix.config.os}} + name: Build desktop + runs-on: ${{matrix.os}} strategy: fail-fast: false matrix: - config: - - { - name: "Windows", - os: windows_x64, - generator: '' - } - - { - name: "Linux", - os: ubuntu-latest, - generator: '-G Ninja' - } + os: [ windows_x64, ubuntu-latest ] # - { # name: "macOS", # os: macos-latest, @@ -39,18 +29,18 @@ jobs: with: submodules: true - name: Install Vulkan SDK - if: matrix.config.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' uses: humbletim/install-vulkan-sdk@v1.1.1 with: version: 1.3.250.1 cache: true - name: Install Dev Packages - if: matrix.config.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' run: > sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin - name: Configure CMake - run: cmake ${{matrix.config.generator}} -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Test