Change matrix

This commit is contained in:
Georg Hagen
2024-07-28 20:17:18 +02:00
parent 9e2d410f52
commit dc3e37b8c6

View File

@@ -11,22 +11,12 @@ env:
jobs: jobs:
build: build:
name: Build desktop - ${{matrix.config.name}} name: Build desktop
runs-on: ${{matrix.config.os}} runs-on: ${{matrix.os}}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
config: os: [ windows_x64, ubuntu-latest ]
- {
name: "Windows",
os: windows_x64,
generator: ''
}
- {
name: "Linux",
os: ubuntu-latest,
generator: '-G Ninja'
}
# - { # - {
# name: "macOS", # name: "macOS",
# os: macos-latest, # os: macos-latest,
@@ -39,18 +29,18 @@ jobs:
with: with:
submodules: true submodules: true
- name: Install Vulkan SDK - name: Install Vulkan SDK
if: matrix.config.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
uses: humbletim/install-vulkan-sdk@v1.1.1 uses: humbletim/install-vulkan-sdk@v1.1.1
with: with:
version: 1.3.250.1 version: 1.3.250.1
cache: true cache: true
- name: Install Dev Packages - name: Install Dev Packages
if: matrix.config.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: > 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 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 && 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 - 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 - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Test - name: Test