Skip to content

Commit

Permalink
Update actions to clang 17 and gcc 12 (#133)
Browse files Browse the repository at this point in the history
  • Loading branch information
xavieran authored Dec 10, 2023
1 parent 2df05ea commit 3fb4496
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# For gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
#sudo add-apt-repository "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu kinetic main" gcc 12 is not available in 20.04...
sudo apt-get install g++-11
sudo apt-get install g++-12

# For clang
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 16 all
sudo ./llvm.sh 17 all

# Other deps
sudo apt-get install freeglut3-dev libsdl2-dev libgl-dev libglew-dev libxinerama-dev libxcursor-dev libxi-dev libxrandr-dev libx11-dev libfluidsynth-dev
6 changes: 3 additions & 3 deletions .github/workflows/clang.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Clang 16
name: Clang 17

on:
push:
Expand All @@ -25,11 +25,11 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: export CC=/usr/bin/clang-16; export CXX=/usr/bin/clang-16; export DONT_COMPILE_SHADERS=true; cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: export CC=/usr/bin/clang-17; export CXX=/usr/bin/clang-17; export DONT_COMPILE_SHADERS=true; cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
run: export CC=/usr/bin/clang-16; export CXX=/usr/bin/clang-16; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
run: export CC=/usr/bin/clang-17; export CXX=/usr/bin/clang-17; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gcc.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: GCC-11
name: GCC-12

on:
push:
Expand All @@ -25,11 +25,11 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: export CC=/usr/bin/gcc-11; export CXX=/usr/bin/g++-11; export DONT_COMPILE_SHADERS=true; cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: export CC=/usr/bin/gcc-12; export CXX=/usr/bin/g++-12; export DONT_COMPILE_SHADERS=true; cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
run: export CC=/usr/bin/gcc-11; export CXX=/usr/bin/g++-11; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
run: export CC=/usr/bin/gcc-12; export CXX=/usr/bin/g++-12; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
Expand Down

0 comments on commit 3fb4496

Please sign in to comment.