Merge pull request #2136 from jriwanek-forks/fix-actions
Disable CLANG64 builds for now
This commit is contained in:
commit
5df092dc7f
8
.github/workflows/cmake.yml
vendored
8
.github/workflows/cmake.yml
vendored
@ -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
|
||||
|
@ -26,4 +26,4 @@ if(SLIRP_EXTERNAL)
|
||||
else()
|
||||
add_subdirectory(slirp)
|
||||
target_link_libraries(86Box slirp)
|
||||
endif()
|
||||
endif()
|
||||
|
@ -1272,4 +1272,4 @@ void endblit()
|
||||
void
|
||||
ui_sb_mt32lcd(char* str)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user