From bee40543995b5d588cdcc391a71f13de8c2a182f Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Fri, 10 Nov 2023 22:32:59 -0500 Subject: [PATCH] Removed Ubuntu Kinetic - Ubuntu Kinetic is a 6 month release that is no longer supported. - Add bootstrap for Ubuntu Mantic; needs containers defined before it can be added to the PR checks --- .github/workflows/gh-actions-pr.yml | 41 +++++++++++++++-------------- script/bootstrap | 31 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 20 deletions(-) diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index 169da267c2..78a326bf1d 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -36,26 +36,27 @@ jobs: # OpenGL_GL_PREFERENCE: 'GLVND' # ENABLE_PIE: 'OFF' # allow_failure: false - - FROM: 'ubuntu:kinetic' - COMPILER: 'gcc' - OpenGL_GL_PREFERENCE: 'LEGACY' - ENABLE_PIE: 'OFF' - allow_failure: false - - FROM: 'ubuntu:kinetic' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'LEGACY' - ENABLE_PIE: 'OFF' - allow_failure: false - - FROM: 'ubuntu:kinetic' - COMPILER: 'gcc' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'OFF' - allow_failure: false - - FROM: 'ubuntu:kinetic' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'OFF' - allow_failure: false + # TODO: Swap kinetic for mantic + #- FROM: 'ubuntu:kinetic' + # COMPILER: 'gcc' + # OpenGL_GL_PREFERENCE: 'LEGACY' + # ENABLE_PIE: 'OFF' + # allow_failure: false + #- FROM: 'ubuntu:kinetic' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'LEGACY' + # ENABLE_PIE: 'OFF' + # allow_failure: false + #- FROM: 'ubuntu:kinetic' + # COMPILER: 'gcc' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'OFF' + # allow_failure: false + #- FROM: 'ubuntu:kinetic' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'OFF' + # allow_failure: false - FROM: 'ubuntu:jammy' COMPILER: 'gcc' OpenGL_GL_PREFERENCE: 'LEGACY' diff --git a/script/bootstrap b/script/bootstrap index 5be0a03195..ebac63d755 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -196,6 +196,37 @@ function bootstrapOnUbuntu() fi case "$LINUX_CODENAME" in + "mantic") + apt-get -qy install \ + git \ + cmake \ + python3-dev \ + build-essential \ + automake \ + autoconf \ + libpng16-16 \ + libpng-dev \ + libpng-tools \ + libjpeg-turbo8-dev \ + libexpat1-dev \ + libgdk-pixbuf-2.0-dev \ + libgtk-3-dev \ + libopenal-dev \ + libogg-dev \ + libvorbis-dev \ + libglvnd-dev \ + libgl1-mesa-dev \ + libsdl2-dev \ + libopengl0 \ + libpostproc-dev \ + freeglut3-dev \ + libboost-python-dev \ + libboost-log-dev \ + libboost-regex-dev \ + libxmu-dev \ + clang \ + lsb-release + ;; "jammy") apt-get -qy install \ git \