Skip to content

Commit

Permalink
CI
Browse files Browse the repository at this point in the history
  • Loading branch information
glx22 committed Oct 13, 2024
1 parent 79c8eac commit c1c2f11
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 17 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -80,18 +80,15 @@ jobs:
fail-fast: false
matrix:
include:
- os: windows-latest
arch: x86
- os: windows-latest
arch: x64
- arch: x86
- arch: x64

name: Windows (${{ matrix.arch }})

uses: ./.github/workflows/ci-windows.yml
secrets: inherit

with:
os: ${{ matrix.os }}
arch: ${{ matrix.arch }}

check_annotations:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
linux:
name: CI

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
CC: ${{ inputs.compiler }}
CXX: ${{ inputs.cxxcompiler }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
arch:
required: true
type: string
os:
required: true
type: string

env:
CTEST_OUTPUT_ON_FAILURE: 1
Expand All @@ -17,7 +14,7 @@ jobs:
windows:
name: CI

runs-on: ${{ inputs.os }}
runs-on: windows-latest

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
docs:
name: Docs

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Download source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
source:
name: Source

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

outputs:
version: ${{ steps.metadata.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-gog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
upload:
name: Upload (GOG)

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Download source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-steam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
upload:
name: Upload (Steam)

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Download source
Expand Down

0 comments on commit c1c2f11

Please sign in to comment.