From 79703457cfbb28116a6d5c5d176b6c15637d286c Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Fri, 18 Feb 2022 04:52:03 -0500 Subject: [PATCH] Disable CLANG64 builds for now --- .github/workflows/cmake.yml | 8 ++++---- src/network/CMakeLists.txt | 2 +- src/unix/unix.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0c85655c1..5f95e1309 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -25,7 +25,7 @@ jobs: msys2: name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }}) - runs-on: windows-latest + runs-on: windows-2022 defaults: run: @@ -68,8 +68,8 @@ jobs: prefix: mingw-w64-ucrt-x86_64 # - msystem: CLANG32 # prefix: mingw-w64-clang-i686 - - msystem: CLANG64 - prefix: mingw-w64-clang-x86_64 +# - msystem: CLANG64 +# prefix: mingw-w64-clang-x86_64 steps: - uses: msys2/setup-msys2@v2 @@ -210,7 +210,7 @@ jobs: linux: name: "Linux GCC 11 (${{ matrix.build.name }} x86_64)" - runs-on: ubuntu-latest + runs-on: ubuntu-2004 strategy: fail-fast: true diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 5cfa87d91..ee9f9bdcc 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -26,4 +26,4 @@ if(SLIRP_EXTERNAL) else() add_subdirectory(slirp) target_link_libraries(86Box slirp) -endif() \ No newline at end of file +endif() diff --git a/src/unix/unix.c b/src/unix/unix.c index a93609e2e..21418697a 100644 --- a/src/unix/unix.c +++ b/src/unix/unix.c @@ -1272,4 +1272,4 @@ void endblit() void ui_sb_mt32lcd(char* str) { -} \ No newline at end of file +}