From dc1f5eb153962dd1f3f847d9e00c30daec86976c Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 5 Oct 2024 12:45:54 -0400 Subject: [PATCH 1/5] Maintenance: Updated Supported Linux Distros --- .github/workflows/gh-actions-pr.yml | 49 ++++++++++++++++++------ .github/workflows/gh-actions-release.yml | 40 ++++++++++++++----- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index 9c10df36a4..e440b2020b 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -16,22 +16,22 @@ jobs: fail-fast: false matrix: include: - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'gcc' OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'OFF' allow_failure: true - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'OFF' allow_failure: true - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'gcc' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' allow_failure: true - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' @@ -56,6 +56,21 @@ jobs: 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' @@ -81,11 +96,16 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' allow_failure: false - - FROM: 'debian:buster' + - FROM: 'opensuse/leap:15.6' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'LEGACY' + ENABLE_PIE: 'ON' + allow_failure: true + - FROM: 'opensuse/leap:15.6' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'OFF' - allow_failure: false + ENABLE_PIE: 'ON' + allow_failure: true - FROM: 'opensuse/leap:15.5' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' @@ -101,27 +121,32 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'fedora:38' + - FROM: 'fedora:39' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'ON' allow_failure: true - - FROM: 'fedora:38' + - FROM: 'fedora:30' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: true - - FROM: 'fedora:37' + - FROM: 'fedora:40' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'LEGACY' + ENABLE_PIE: 'ON' + allow_failure: true + - FROM: 'fedora:40' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux:9.1' + - FROM: 'rockylinux:9.4' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux:8.7' + - FROM: 'rockylinux:8.10' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml index 20c58b9a2b..132df56d1e 100644 --- a/.github/workflows/gh-actions-release.yml +++ b/.github/workflows/gh-actions-release.yml @@ -20,12 +20,12 @@ jobs: fail-fast: false matrix: include: - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'OFF' ARTIFACT_EXT: 'deb' - - FROM: 'ubuntu:mantic' + - FROM: 'ubuntu:noble' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' @@ -46,6 +46,21 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' ARTIFACT_EXT: 'tar.[xb]z*' + - FROM: 'linuxmintd/mint22-amd64' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'GLVND' + ENABLE_PIE: 'OFF' + ARTIFACT_EXT: 'deb' + - FROM: 'linuxmintd/mint21.3-amd64' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'GLVND' + ENABLE_PIE: 'OFF' + ARTIFACT_EXT: 'deb' + - FROM: 'linuxmintd/mint21.2-amd64' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'GLVND' + ENABLE_PIE: 'OFF' + ARTIFACT_EXT: 'deb' - FROM: 'linuxmintd/mint21.1-amd64' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' @@ -71,11 +86,11 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'OFF' ARTIFACT_EXT: 'deb' - - FROM: 'debian:buster' + - FROM: 'opensuse/leap:15.6' COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'OFF' - ARTIFACT_EXT: 'deb' + OpenGL_GL_PREFERENCE: 'LEGACY' + ENABLE_PIE: 'ON' + ARTIFACT_EXT: 'rpm' - FROM: 'opensuse/leap:15.5' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' @@ -91,17 +106,22 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'fedora:38' + - FROM: 'fedora:40' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'fedora:38' + - FROM: 'fedora:40' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'fedora:37' + - FROM: 'fedora:39' + COMPILER: 'clang' + OpenGL_GL_PREFERENCE: 'LEGACY' + ENABLE_PIE: 'ON' + ARTIFACT_EXT: 'rpm' + - FROM: 'fedora:39' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' @@ -111,7 +131,7 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'rockylinux:8.7' + - FROM: 'rockylinux:8.10' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' From e105954d82b037a681304d1270448717e7debd7c Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 5 Oct 2024 12:52:56 -0400 Subject: [PATCH 2/5] Bug Fix: 30 should have been 39 --- .github/workflows/gh-actions-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index e440b2020b..db08108818 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -126,7 +126,7 @@ jobs: OpenGL_GL_PREFERENCE: 'LEGACY' ENABLE_PIE: 'ON' allow_failure: true - - FROM: 'fedora:30' + - FROM: 'fedora:39' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' From 78c212251acede6f39b8d25723207ac704dcc959 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 5 Oct 2024 14:30:25 -0400 Subject: [PATCH 3/5] Bug Fix: Rocky Linux Image Name changed --- .github/workflows/gh-actions-pr.yml | 4 ++-- .github/workflows/gh-actions-release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index db08108818..d8a1264026 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -141,12 +141,12 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux:9.4' + - FROM: 'rockylinux_rockylinux:9.4' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux:8.10' + - FROM: 'rockylinux_rockylinux:8.10' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml index 132df56d1e..bdcd0197f5 100644 --- a/.github/workflows/gh-actions-release.yml +++ b/.github/workflows/gh-actions-release.yml @@ -126,12 +126,12 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'rockylinux:9.1' + - FROM: 'rockylinux_rockylinux:9.1' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'rockylinux:8.10' + - FROM: 'rockylinux_rockylinux:8.10' COMPILER: 'clang' OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' From 0074505ec7ba43f61e3019932ee0182176bb972b Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 5 Oct 2024 22:30:30 -0400 Subject: [PATCH 4/5] Maintenance: Sync bootstrap with image repo --- script/bootstrap | 704 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 574 insertions(+), 130 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 9c985be16b..9ce02fa4c6 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -9,7 +9,7 @@ # @param : just one parameter, either a 1 or a 0, to indicate whether or not to # UPDATE_ALL_SYSTEM_PACKAGES #==================================== -# Copyright (C) 2020-2023 Stephen G. Tuggy and other Vega Strike contributors +# Copyright (C) 2020-2024 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors # # This file is part of Vega Strike. # @@ -20,16 +20,16 @@ # # Vega Strike is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Vega Strike. If not, see . +# along with Vega Strike. If not, see . set -e echo "------------------------------" -echo "--- bootstrap | 2023-11-24 ---" +echo "--- bootstrap | 2024-10-05 ---" echo "------------------------------" UPDATE_ALL_SYSTEM_PACKAGES="$1" @@ -124,16 +124,44 @@ function bootstrapOnDebian() lsb-release ;; "buster") + echo "Sorry, Debian buster is no longer supported" + exit 2 + ;; + "stretch") + echo "Sorry, Debian stretch is no longer supported" + exit 2 + ;; + *) + echo "Sorry, this version of Debian is unsupported" + exit 2 + ;; + esac +} + +function bootstrapOnUbuntu() +{ + apt-get update + + if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] + then + apt-get -qy upgrade + fi + + case "$LINUX_CODENAME" in + "noble") apt-get -qy install \ git \ + cmake \ + python3-dev \ build-essential \ automake \ autoconf \ libpng16-16 \ libpng-dev \ libpng-tools \ - libjpeg62-turbo-dev \ + libjpeg-turbo8-dev \ libexpat1-dev \ + libgdk-pixbuf-2.0-dev \ libgtk-3-dev \ libopenal-dev \ libogg-dev \ @@ -142,6 +170,7 @@ function bootstrapOnDebian() libgl1-mesa-dev \ libsdl1.2-dev \ libsdl2-dev \ + libopengl0 \ libpostproc-dev \ freeglut3-dev \ libboost-python-dev \ @@ -151,33 +180,8 @@ function bootstrapOnDebian() libxmu-dev \ clang \ lsb-release - echo "deb http://deb.debian.org/debian buster-backports main contrib" >> /etc/apt/sources.list - echo "deb-src http://deb.debian.org/debian buster-backports main contrib" >> /etc/apt/sources.list - apt-get update - apt-get -qy install cmake -t buster-backports - ;; - "stretch") - echo "Sorry, Debian stretch is no longer supported" - exit 2 - ;; - *) - echo "Sorry, this version of Debian is unsupported" - exit 2 ;; - esac -} - -function bootstrapOnUbuntu() -{ - apt-get update - - if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] - then - apt-get -qy upgrade - fi - - case "$LINUX_CODENAME" in - "mantic") + "jammy") apt-get -qy install \ git \ cmake \ @@ -210,20 +214,18 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; - "lunar") + "focal") apt-get -qy install \ git \ cmake \ - python3-dev \ build-essential \ automake \ autoconf \ libpng16-16 \ libpng-dev \ libpng-tools \ - libjpeg-turbo8-dev \ + libjpeg62-dev \ libexpat1-dev \ - libgdk-pixbuf-2.0-dev \ libgtk-3-dev \ libopenal-dev \ libogg-dev \ @@ -243,6 +245,39 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; + "bionic") + echo "Sorry, Ubuntu bionic is no longer supported" + exit 2 + ;; + "impish") + echo "Sorry, Ubuntu impish is no longer supported" + exit 2 + ;; + "hirsute") + echo "Sorry, Ubuntu hirsute is no longer supported" + exit 2 + ;; + "xenial") + echo "Sorry, Ubuntu xenial is no longer supported" + exit 2 + ;; + *) + echo "Sorry, this version of Ubuntu is unsupported" + exit 2 + ;; + esac +} + +function bootstrapOnPopOS () +{ + apt-get update + + if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] + then + apt-get -qy upgrade + fi + + case "$LINUX_CODENAME" in "jammy") apt-get -qy install \ git \ @@ -276,7 +311,7 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; - "groovy") + "noble") apt-get -qy install \ git \ cmake \ @@ -287,8 +322,9 @@ function bootstrapOnUbuntu() libpng16-16 \ libpng-dev \ libpng-tools \ - libjpeg62-dev \ + libjpeg-turbo8-dev \ libexpat1-dev \ + libgdk-pixbuf-2.0-dev \ libgtk-3-dev \ libopenal-dev \ libogg-dev \ @@ -308,25 +344,44 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; - "focal") + *) + echo "Sorry, this version of Pop! OS is not currently supported" + exit 2 + ;; + esac +} + +function bootstrapOnLinuxMint () +{ + apt-get update + + if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] + then + apt-get -qy upgrade + fi + + case "$LINUX_CODENAME" in + "wilma") apt-get -qy install \ git \ cmake \ + python3-dev \ build-essential \ automake \ autoconf \ libpng16-16 \ libpng-dev \ libpng-tools \ - libjpeg62-dev \ + libjpeg-turbo8-dev \ libexpat1-dev \ + libgdk-pixbuf-2.0-dev \ libgtk-3-dev \ libopenal-dev \ libogg-dev \ libvorbis-dev \ libglvnd-dev \ libgl1-mesa-dev \ - libsdl1.2-dev \ + libsdl1.2-compat-dev \ libsdl2-dev \ libopengl0 \ libpostproc-dev \ @@ -339,61 +394,40 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; - "bionic") + "virginia") 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 \ + libsdl1.2-compat-dev \ + libsdl2-dev \ + libopengl0 \ + libpostproc-dev \ freeglut3-dev \ - libopenal-dev \ - libsdl-gfx1.2-dev \ - libsdl2-gfx-dev \ - libvorbis-dev \ - libjpeg-dev \ - libpng-dev \ - libgtk-3-dev \ libboost-python-dev \ libboost-log-dev \ libboost-regex-dev \ libboost-program-options-dev \ libxmu-dev \ clang \ - lsb-release \ - python3-pip - python3 -m pip install --upgrade-strategy eager --upgrade pip - python3 -m pip install --upgrade-strategy eager cmake - ;; - "impish") - echo "Sorry, Ubuntu impish is no longer supported" - exit 2 - ;; - "hirsute") - echo "Sorry, Ubuntu hirsute is no longer supported" - exit 2 - ;; - "xenial") - echo "Sorry, Ubuntu xenial is no longer supported" - exit 2 - ;; - *) - echo "Sorry, this version of Ubuntu is unsupported" - exit 2 + lsb-release ;; - esac -} - -function bootstrapOnPopOS () -{ - apt-get update - - if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] - then - apt-get -qy upgrade - fi - - case "$LINUX_CODENAME" in - "jammy") + "victoria") apt-get -qy install \ git \ cmake \ @@ -413,7 +447,7 @@ function bootstrapOnPopOS () libvorbis-dev \ libglvnd-dev \ libgl1-mesa-dev \ - libsdl1.2-dev \ + libsdl1.2-compat-dev \ libsdl2-dev \ libopengl0 \ libpostproc-dev \ @@ -426,23 +460,6 @@ function bootstrapOnPopOS () clang \ lsb-release ;; - *) - echo "Sorry, this version of Pop! OS is not currently supported" - exit 2 - ;; - esac -} - -function bootstrapOnLinuxMint () -{ - apt-get update - - if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ] - then - apt-get -qy upgrade - fi - - case "$LINUX_CODENAME" in "vera") apt-get -qy install \ git \ @@ -682,6 +699,39 @@ function bootstrapOnOpenSuseLeap () rpm-build \ clang ;; + "15.6") + zypper --non-interactive install -y \ + libboost_log1_75_0-devel \ + libboost_python-py3-1_75_0-devel \ + libboost_system1_75_0-devel \ + libboost_filesystem1_75_0-devel \ + libboost_thread1_75_0-devel \ + libboost_regex1_75_0-devel \ + libboost_chrono1_75_0-devel \ + libboost_atomic1_75_0-devel \ + libboost_program_options1_75_0-devel \ + cmake \ + gcc-c++ \ + freeglut-devel \ + libopenal0 \ + openal-soft-devel \ + libSDL-1_2-0 \ + libSDL-devel \ + libSDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo \ + libjpeg62-devel \ + libpng16-devel \ + expat \ + libexpat-devel \ + libgtk-3-0 \ + gtk3-devel \ + python3-devel \ + git \ + rpm-build \ + clang + ;; *) echo "Sorry, this version of openSUSE Leap is unsupported" exit 2 @@ -881,31 +931,18 @@ function bootstrapOnFedora () make \ clang ;; - *) - echo "Sorry, this version of Fedora is unsupported" - exit 2 - ;; - esac -} - -function bootstrapOnCentOS () -{ - case "${LINUX_VERSION_ID}" in - "8") - dnf -y install dnf-plugins-core - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - dnf config-manager --set-enabled PowerTools - dnf -y install \ + 39) + dnf install -y \ git \ cmake \ boost-devel \ - boost-python3-devel \ freeglut-devel \ gcc-c++ \ openal-soft-devel \ - SDL-devel \ + sdl12-compat-devel \ SDL2-devel \ libvorbis-devel \ + libglvnd-devel \ libjpeg-turbo-devel \ libpng-devel \ expat-devel \ @@ -915,21 +952,18 @@ function bootstrapOnCentOS () make \ clang ;; - "8.0") - dnf -y install dnf-plugins-core - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - dnf config-manager --set-enabled PowerTools - dnf -y install \ + 40) + dnf install -y \ git \ cmake \ boost-devel \ - boost-python3-devel \ freeglut-devel \ gcc-c++ \ openal-soft-devel \ - SDL-devel \ + sdl12-compat-devel \ SDL2-devel \ libvorbis-devel \ + libglvnd-devel \ libjpeg-turbo-devel \ libpng-devel \ expat-devel \ @@ -939,12 +973,91 @@ function bootstrapOnCentOS () make \ clang ;; - *) - echo "Sorry, this version of CentOS is unsupported" - exit 2 - ;; - esac -} + 41) + dnf install -y \ + git \ + cmake \ + boost-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + *) + echo "Sorry, this version of Fedora is unsupported" + exit 2 + ;; + esac +} + +function bootstrapOnCentOS () +{ + case "${LINUX_VERSION_ID}" in + "8") + dnf -y install dnf-plugins-core + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf config-manager --set-enabled PowerTools + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "8.0") + dnf -y install dnf-plugins-core + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf config-manager --set-enabled PowerTools + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + *) + echo "Sorry, this version of CentOS is unsupported" + exit 2 + ;; + esac +} function bootstrapOnRedHat () { @@ -1149,6 +1262,81 @@ function bootstrapOnRedHat () make \ clang ;; + "8.8") + dnf -y install dnf-plugins-core + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf config-manager --set-enabled PowerTools + dnf -y install \ + git \ + cmake \ + python3.11-devel \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + rpm-build \ + make \ + clang + ;; + "8.9") + dnf -y install dnf-plugins-core + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf config-manager --set-enabled PowerTools + dnf -y install \ + git \ + cmake \ + python3.11-devel \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + rpm-build \ + make \ + clang + ;; + "8.10") + dnf -y install dnf-plugins-core + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf config-manager --set-enabled PowerTools + dnf -y install \ + git \ + cmake \ + python3.11-devel \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + rpm-build \ + make \ + clang + ;; "9.0") dnf -y install dnf-plugins-core dnf config-manager --set-enabled devel @@ -1199,6 +1387,106 @@ function bootstrapOnRedHat () make \ clang ;; + "9.2") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "9.3") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "9.4") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "9.5") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; *) echo "Sorry, this version of Red Hat is unsupported" exit 2 @@ -1425,6 +1713,87 @@ function bootstrapOnRockyLinux () make \ clang ;; + "8.8") + dnf -y install dnf-plugins-core + dnf -y install epel-release + dnf config-manager --enable epel + dnf config-manager --set-enabled powertools + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "8.9") + dnf -y install dnf-plugins-core + dnf -y install epel-release + dnf config-manager --enable epel + dnf config-manager --set-enabled powertools + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "8.10") + dnf -y install dnf-plugins-core + dnf -y install epel-release + dnf config-manager --enable epel + dnf config-manager --set-enabled powertools + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + SDL-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; "9.0") dnf -y install dnf-plugins-core dnf config-manager --set-enabled devel @@ -1475,6 +1844,81 @@ function bootstrapOnRockyLinux () make \ clang ;; + "9.2") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "9.3") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; + "9.4") + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled devel + dnf -y update + dnf -y install \ + git \ + cmake \ + boost-devel \ + boost-python3-devel \ + freeglut-devel \ + gcc-c++ \ + openal-soft-devel \ + sdl12-compat-devel \ + SDL2-devel \ + libvorbis-devel \ + libglvnd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + expat-devel \ + gtk3-devel \ + python3-devel \ + rpm-build \ + make \ + clang + ;; *) echo "Sorry, this version of Rocky Linux is unsupported" exit 2 From 4dbb8c8543804316877ab0c684eedc46200bc147 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 12 Oct 2024 00:11:37 -0400 Subject: [PATCH 5/5] Disable Rocky Linux 8.10 There's some bugs with building on Rocky Linux 8.10. Disable it until either it completely leaves our support window or someone in the community that runs Rocky Linux 8.10 steps up to help fix the issues. --- .github/workflows/gh-actions-pr.yml | 11 ++++++----- .github/workflows/gh-actions-release.yml | 11 ++++++----- script/bootstrap | 6 +++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index d8a1264026..f786ca3d31 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -146,11 +146,12 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' allow_failure: false - - FROM: 'rockylinux_rockylinux:8.10' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'ON' - allow_failure: false + # Disabled until the build can be fixed + #- FROM: 'rockylinux_rockylinux:8.10' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'ON' + # allow_failure: false #- FROM: 'manjarolinux/base' # COMPILER: 'clang' # OpenGL_GL_PREFERENCE: 'LEGACY' diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml index bdcd0197f5..4b29f968f2 100644 --- a/.github/workflows/gh-actions-release.yml +++ b/.github/workflows/gh-actions-release.yml @@ -131,11 +131,12 @@ jobs: OpenGL_GL_PREFERENCE: 'GLVND' ENABLE_PIE: 'ON' ARTIFACT_EXT: 'rpm' - - FROM: 'rockylinux_rockylinux:8.10' - COMPILER: 'clang' - OpenGL_GL_PREFERENCE: 'GLVND' - ENABLE_PIE: 'ON' - ARTIFACT_EXT: 'rpm' + # Disabled until the build can be fixed + #- FROM: 'rockylinux_rockylinux:8.10' + # COMPILER: 'clang' + # OpenGL_GL_PREFERENCE: 'GLVND' + # ENABLE_PIE: 'ON' + # ARTIFACT_EXT: 'rpm' steps: - name: Check out repository diff --git a/script/bootstrap b/script/bootstrap index 9ce02fa4c6..446e5ed571 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -1735,7 +1735,7 @@ function bootstrapOnRockyLinux () libpng-devel \ expat-devel \ gtk3-devel \ - python3-devel \ + python3.11-devel \ rpm-build \ make \ clang @@ -1762,7 +1762,7 @@ function bootstrapOnRockyLinux () libpng-devel \ expat-devel \ gtk3-devel \ - python3-devel \ + python3.11-devel \ rpm-build \ make \ clang @@ -1789,7 +1789,7 @@ function bootstrapOnRockyLinux () libpng-devel \ expat-devel \ gtk3-devel \ - python3-devel \ + python3.11-devel \ rpm-build \ make \ clang