From ae91d911303c0b0798e7f8dd33712d8ef1063fe3 Mon Sep 17 00:00:00 2001 From: Jaremie Romer <33360084+jaremieromer@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:50:44 -0500 Subject: [PATCH 1/4] Update build.yml Remove --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98a13f78ac..94f5e2af55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,6 @@ jobs: options: "-DCMAKE_BUILD_TYPE=Release" artifactUploadName: "swiftshader-ubuntu22.04-x64" artifactLocation: "build_out/Linux/" - - name: Mac - os: macos-13 - generator: "Xcode" - options: "-DCMAKE_BUILD_TYPE=Release" - artifactUploadName: "swiftshader-macOS-x64" - artifactLocation: "build_out/Darwin/" name: ${{ matrix.name }} runs-on: ${{ matrix.os }} From 8e31076c14b1816940df49742424796913e56a1d Mon Sep 17 00:00:00 2001 From: Jaremie Romer <33360084+jaremieromer@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:24:32 -0500 Subject: [PATCH 2/4] Removed Linux temporarily --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94f5e2af55..f76e7c0769 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,6 @@ jobs: options: -Thost=x64 artifactUploadName: "swiftshader-windows-x64" artifactLocation: "build_out/Windows/" - - name: Linux - os: ubuntu-22.04 - generator: "Unix Makefiles" - env: "CXX=/usr/bin/g++-13" - options: "-DCMAKE_BUILD_TYPE=Release" - artifactUploadName: "swiftshader-ubuntu22.04-x64" - artifactLocation: "build_out/Linux/" name: ${{ matrix.name }} runs-on: ${{ matrix.os }} From 8683cd1ca53821890b9b31d5815108c14c5bee80 Mon Sep 17 00:00:00 2001 From: Jaremie Romer <33360084+jaremieromer@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:11:26 -0500 Subject: [PATCH 3/4] Removed shader debugging --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f76e7c0769..bdca4b8a26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Configure - run: ${{ matrix.env }} cmake -G "${{ matrix.generator }}" -S ./ -B build_out ${{ matrix.options }} -DSWIFTSHADER_ENABLE_VULKAN_DEBUGGER=1 + run: ${{ matrix.env }} cmake -G "${{ matrix.generator }}" -S ./ -B build_out ${{ matrix.options }} - name: Build run: cmake --build build_out --target vk_swiftshader --config Release --parallel 4 From ac6138ed9deceb78ba989b5bc365c7e2f4ae11fb Mon Sep 17 00:00:00 2001 From: Jaremie Romer <33360084+jaremieromer@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:56:25 -0500 Subject: [PATCH 4/4] Added Linux back in --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdca4b8a26..e3d8bbf60e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,13 @@ jobs: options: -Thost=x64 artifactUploadName: "swiftshader-windows-x64" artifactLocation: "build_out/Windows/" + - name: Linux + os: ubuntu-22.04 + generator: "Unix Makefiles" + env: "CXX=/usr/bin/g++-13" + options: "-DCMAKE_BUILD_TYPE=Release" + artifactUploadName: "swiftshader-ubuntu22.04-x64" + artifactLocation: "build_out/Linux/" name: ${{ matrix.name }} runs-on: ${{ matrix.os }}