Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into Maniacs-Battle
Browse files Browse the repository at this point in the history
  • Loading branch information
MackValentine committed May 5, 2024
2 parents a409eff + b313163 commit 6e8b291
Show file tree
Hide file tree
Showing 219 changed files with 8,296 additions and 3,047 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ src/midisequencer.* -diff linguist-vendored
src/midisynth.* -diff linguist-vendored
src/picojson.h -diff linguist-vendored
CMakePresets.json -diff linguist-generated
builds/android/app/src/main/java/org/libsdl/app/SDL*.java -diff linguist-vendored
builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
builds/android/app/src/main/java/org/libsdl/app/HID*.java -diff linguist-vendored
src/generated/* -diff linguist-generated
31 changes: 17 additions & 14 deletions .github/workflows/stable-compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
description: Git Ref (Optional)
required: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash
Expand All @@ -24,31 +28,31 @@ jobs:
fail-fast: false
matrix:
image:
- debian:10 # oldstable | CMake 3.13.4 | G++ 8.3.0 | SDL 2.0.9
- ubuntu:20.04 # LTS | CMake 3.16.3 | G++ 9.3.0 | SDL 2.0.10
- debian:11 # stable | CMake 3.18.4 | G++ 10.2.1 | SDL 2.0.14
- ubuntu:22.04 # LTS | CMake 3.22.1 | G++ 11.2.0 | SDL 2.0.20
# version of: # CMake | g++ | SDL | support end #
# -------------------------------------------------------------
- ubuntu:20.04 # 3.16.3 | 9.3.0 | 2.0.10 | LTS (4/25) #
- debian:11 # 3.18.4 | 10.2.1 | 2.0.14 | oldstable (8/24) #
- ubuntu:22.04 # 3.22.1 | 11.2.0 | 2.0.20 | LTS (6/27) #
- debian:12 # 3.25.1 | 12.2.0 | 2.26.5 | stable (6/26) #

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]

- name: Install dependencies
run: |
export DEBIAN_FRONTEND="noninteractive"
apt-get update
apt-get install -yqq --no-install-recommends --no-install-suggests \
ca-certificates build-essential cmake ninja-build git \
libicu-dev libexpat1-dev libsdl2-dev libpng-dev libpixman-1-dev \
libfmt-dev libfreetype6-dev libharfbuzz-dev libmpg123-dev \
libsndfile-dev libvorbis-dev libopusfile-dev libspeexdsp-dev \
libicu-dev libexpat1-dev libinih-dev \
libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
libvorbis-dev libopusfile-dev libspeexdsp-dev \
libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
if: github.event.inputs.git-ref == ''
- name: Clone Repository (with custom ref)
uses: actions/checkout@v2
uses: actions/checkout@v4
if: github.event.inputs.git-ref != ''
with:
ref: ${{ github.event.inputs.git-ref }}
Expand All @@ -63,8 +67,7 @@ jobs:
- name: Install
run: |
# cmake < 3.16 does not support '--install'
cmake --build build --target install
cmake --install build
- name: Test
run: |
Expand Down
Loading

0 comments on commit 6e8b291

Please sign in to comment.