Skip to content

Commit 2904015

Browse files
committed
Update GitHub Actions and Catch2
1 parent 0455a60 commit 2904015

File tree

3 files changed

+124
-83
lines changed

3 files changed

+124
-83
lines changed

.github/workflows/ci.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,26 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
platform:
14-
- { name: Windows VS2019, os: windows-latest }
15-
- { name: Linux GCC, os: ubuntu-latest }
16-
- { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
17-
- { name: MacOS XCode, os: macos-latest }
14+
- { name: Windows VS2022, os: windows-2022 }
15+
- { name: Linux GCC, os: ubuntu-22.04 }
16+
- { name: Linux Clang, os: ubuntu-22.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
17+
- { name: macOS x64, os: macos-14, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 }
18+
- { name: macOS M1, os: macos-14, flags: -DCMAKE_OSX_ARCHITECTURES=arm64 }
1819

1920
steps:
2021
- name: PubBus - Checkout Code
21-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2223

2324
- name: SFML - Install Linux Dependencies
2425
if: runner.os == 'Linux'
2526
run: sudo apt-get update && sudo apt-get install libxrandr-dev libxcursor-dev libudev-dev libgl1-mesa-dev libegl1-mesa-dev
2627

2728
- name: SFML - Checkout Code
28-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
2930
with:
3031
repository: SFML/SFML
3132
path: SFML
33+
ref: 2.6.x
3234

3335
- name: SFML - Configure CMake
3436
shell: bash
@@ -40,7 +42,7 @@ jobs:
4042

4143
- name: PubBus - Configure CMake
4244
shell: bash
43-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install -DSFML_DIR=$GITHUB_WORKSPACE/SFML/install/lib/cmake/SFML -DPUBBUS_INSTALL_EXAMPLE=ON -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}}
45+
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install -DSFML_DIR=$GITHUB_WORKSPACE/SFML/install/lib/cmake/SFML -DPUBBUS_INSTALL_EXAMPLE=ON -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}}
4446

4547
- name: PubBus - Build
4648
shell: bash

examples/SFML/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
find_package(SFML 2.5 COMPONENTS graphics REQUIRED)
1+
find_package(SFML 2.6 COMPONENTS graphics REQUIRED)
22

33
add_executable(SFML "SFML.cpp" "Messages.hpp")
44

0 commit comments

Comments
 (0)