Skip to content

Commit

Permalink
Upgrade from jammy to noble
Browse files Browse the repository at this point in the history
in github-actions.
Remove old OSes.
  • Loading branch information
royfalk committed Dec 10, 2024
1 parent c1445b2 commit ebd6df4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 47 deletions.
47 changes: 1 addition & 46 deletions .github/workflows/gh-actions-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [ pull_request ]
jobs:
build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
continue-on-error: ${{ matrix.allow_failure }}

defaults:
Expand Down Expand Up @@ -36,56 +36,11 @@ jobs:
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: true
- FROM: 'ubuntu:jammy'
COMPILER: 'gcc'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'ubuntu:jammy'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'ubuntu:focal'
COMPILER: 'gcc'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'ubuntu:focal'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'linuxmintd/mint22-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: true
- FROM: 'linuxmintd/mint21.3-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: true
- FROM: 'linuxmintd/mint21.2-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: true
- FROM: 'linuxmintd/mint21.1-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: true
- FROM: 'linuxmintd/mint21-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'linuxmintd/mint20-amd64'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'debian:bookworm'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
Expand Down
2 changes: 1 addition & 1 deletion engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ IF (USE_SYSTEM_BOOST)

UNSET(Boost_${BOOST_PYTHON_COMPONENT}_FOUND)
MESSAGE("++ Looking for System Boost::python")
FIND_PACKAGE(Boost COMPONENTS ${BOOST_PYTHON_COMPONENT} json log log_setup date_time system filesystem thread chrono atomic REQUIRED)
FIND_PACKAGE(Boost COMPONENTS python3 json log log_setup date_time system filesystem thread chrono atomic REQUIRED)
IF (Boost_python3_FOUND)
MESSAGE("++ Found System Boost::python3 : ${Boost_PYTHON3_LIBRARY}")
ELSEIF (Boost_${BOOST_PYTHON_COMPONENT}_FOUND)
Expand Down

0 comments on commit ebd6df4

Please sign in to comment.