From e45d2a277ce839f61f95d2c652634dfdf4138e2c Mon Sep 17 00:00:00 2001 From: Laura Hermanns Date: Thu, 3 Aug 2023 00:00:37 -0400 Subject: [PATCH] Generalized build matrix in Linux CIS script. --- .github/workflows/ci_linux.yml | 45 +++++++++------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index e8e1ffcb4a..1fa38014d3 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -7,34 +7,12 @@ on: branches: [ "master" ] jobs: - build_linux_debug: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 + build_linux: + strategy: + matrix: + config: [Debug, Release] + lib: [Shared, Static] - - name: Checkout Dependencies - run: | - git clone https://github.com/LukasBanana/GaussianLib.git - sudo wget -O /etc/apt/trusted.gpg.d/lunarg-signing-key-pub.asc http://packages.lunarg.com/lunarg-signing-key-pub.asc - sudo wget -O /etc/apt/sources.list.d/lunarg-vulkan-1.3.236-jammy.list https://packages.lunarg.com/vulkan/1.3.236/lunarg-vulkan-1.3.236-jammy.list - sudo apt update - sudo apt-get install libx11-dev libxrandr-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev vulkan-sdk vulkan-tools - - - name: Configure CMake Debug - run: cmake -S . -B ${{github.workspace}}/build_debug -DCMAKE_BUILD_TYPE=Debug -DLLGL_BUILD_RENDERER_OPENGL=ON -DLLGL_BUILD_RENDERER_VULKAN=ON -DLLGL_BUILD_EXAMPLES=ON -DLLGL_BUILD_TESTS=ON -DLLGL_BUILD_WRAPPER_C99=ON -DGaussLib_INCLUDE_DIR:STRING="GaussianLib/include" - - - name: Build Debug - run: cmake --build ${{github.workspace}}/build_debug --config Debug - - - name: Testbed Debug - working-directory: tests/Testbed - run: | - mkdir Output/ - mkdir Output/OpenGL - xvfb-run ${{github.workspace}}/build_debug/build/TestbedD gl -v -f -t - - build_linux_release: runs-on: ubuntu-latest steps: @@ -48,16 +26,15 @@ jobs: sudo apt update sudo apt-get install libx11-dev libxrandr-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev vulkan-sdk vulkan-tools - - name: Configure CMake Release - run: cmake -S . -B ${{github.workspace}}/build_linux_release -DCMAKE_BUILD_TYPE=Release -DLLGL_BUILD_RENDERER_OPENGL=ON -DLLGL_BUILD_RENDERER_VULKAN=ON -DLLGL_BUILD_EXAMPLES=ON -DLLGL_BUILD_TESTS=ON -DLLGL_BUILD_WRAPPER_C99=ON -DGaussLib_INCLUDE_DIR:STRING="GaussianLib/include" + - name: Configure CMake + run: cmake -S . -B ${{github.workspace}}/build_linux -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DLLGL_BUILD_STATIC_LIB=${{ matrix.lib == 'Static' && 'ON' || 'OFF' }} -DLLGL_BUILD_RENDERER_OPENGL=ON -DLLGL_BUILD_RENDERER_VULKAN=ON -DLLGL_BUILD_EXAMPLES=ON -DLLGL_BUILD_TESTS=ON -DLLGL_BUILD_WRAPPER_C99=ON -DGaussLib_INCLUDE_DIR:STRING="GaussianLib/include" - - name: Build Release - run: cmake --build ${{github.workspace}}/build_linux_release --config Release + - name: Build + run: cmake --build ${{github.workspace}}/build_linux --config ${{ matrix.config }} - - name: Testbed Release + - name: Testbed working-directory: tests/Testbed run: | mkdir Output/ mkdir Output/OpenGL - xvfb-run ${{github.workspace}}/build_linux_release/build/Testbed gl -v -f -t - + xvfb-run ${{github.workspace}}/build_linux/build/${{ matrix.config == 'Debug' && 'TestbedD' || 'Testbed' }} gl -v -f -t