diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index bc833cbc7c6bf..8805550968f24 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -26,8 +26,8 @@ jobs: matrix: include: - name: Clang - compiler: clang-15 - cxxcompiler: clang++-15 + compiler: clang + cxxcompiler: clang++ libraries: libsdl2-dev - name: GCC - SDL2 compiler: gcc @@ -80,10 +80,8 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest - arch: x86 - - os: windows-latest - arch: x64 + - arch: x86 + - arch: x64 name: Windows (${{ matrix.arch }}) @@ -91,7 +89,6 @@ jobs: secrets: inherit with: - os: ${{ matrix.os }} arch: ${{ matrix.arch }} check_annotations: diff --git a/.github/workflows/ci-emscripten.yml b/.github/workflows/ci-emscripten.yml index 6e39fcf087ec3..13cce318c7840 100644 --- a/.github/workflows/ci-emscripten.yml +++ b/.github/workflows/ci-emscripten.yml @@ -10,7 +10,7 @@ jobs: emscripten: name: CI - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: # If you change this version, change the number in the cache step too. image: emscripten/emsdk:3.1.57 diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index bfe345412ac32..63bf1e18db332 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -23,7 +23,7 @@ jobs: linux: name: CI - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: CC: ${{ inputs.compiler }} CXX: ${{ inputs.cxxcompiler }} diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index f4cabfddf53f8..2a0cd004287e2 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -21,7 +21,7 @@ jobs: macos: name: CI - runs-on: macos-14 + runs-on: macos-latest env: MACOSX_DEPLOYMENT_TARGET: 10.13 diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index b748e8db2ed2a..789017bdb92a8 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -6,9 +6,6 @@ on: arch: required: true type: string - os: - required: true - type: string env: CTEST_OUTPUT_ON_FAILURE: 1 @@ -17,7 +14,7 @@ jobs: windows: name: CI - runs-on: ${{ inputs.os }} + runs-on: windows-latest steps: - name: Checkout diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml index 83868e52665ef..c811e01e18747 100644 --- a/.github/workflows/release-docs.yml +++ b/.github/workflows/release-docs.yml @@ -11,7 +11,7 @@ jobs: docs: name: Docs - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Download source diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 7859af6e680d2..db063ab8c4fd3 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -12,7 +12,7 @@ jobs: macos: name: MacOS - runs-on: macos-14 + runs-on: macos-latest env: MACOSX_DEPLOYMENT_TARGET: 10.13 diff --git a/.github/workflows/release-source.yml b/.github/workflows/release-source.yml index 331ba6821dec3..b39e9396e5942 100644 --- a/.github/workflows/release-source.yml +++ b/.github/workflows/release-source.yml @@ -18,7 +18,7 @@ jobs: source: name: Source - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: version: ${{ steps.metadata.outputs.version }} diff --git a/.github/workflows/upload-gog.yml b/.github/workflows/upload-gog.yml index 1370988f3eb1e..cbe81c6a845a3 100644 --- a/.github/workflows/upload-gog.yml +++ b/.github/workflows/upload-gog.yml @@ -11,7 +11,7 @@ jobs: upload: name: Upload (GOG) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Download source diff --git a/.github/workflows/upload-steam.yml b/.github/workflows/upload-steam.yml index 47fa48d01b06f..1cf17239fdbb5 100644 --- a/.github/workflows/upload-steam.yml +++ b/.github/workflows/upload-steam.yml @@ -14,7 +14,7 @@ jobs: upload: name: Upload (Steam) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Download source