Merge pull request #48 from stephengtuggy/more-on-rocky-8.9-etc

Update script/bootstrap, script/cibuild, and 2 GH Workflows: Anchore-…
vegastrike · Apr 25, 2024 · 2e11537 · 2e11537
2 parents 1153eb6 + bfd1bb0
commit 2e11537
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 60 deletions.
diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
@@ -74,14 +74,14 @@ jobs:
         env:
           FROM:       ${{ matrix.FROM }}
           MY_OS_NAME: linux
-          IS_RELEASE: 1
+          IS_RELEASE: 0
 
       - name: build local container
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.3.0
         env:
           FROM:       ${{ matrix.FROM }}
           MY_OS_NAME: linux
-          IS_RELEASE: 1
+          IS_RELEASE: 0
         with:
           build-args: from=${{ matrix.FROM }}
           tags: localbuild/${{ matrix.FROM }}

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -57,6 +57,7 @@ jobs:
     # As opposed to the merge commit
     - name: Move to PR HEAD
       run: git checkout HEAD^2
+
     - name: Run CI
       env:
         FROM:       ${{ matrix.FROM }}

diff --git a/script/bootstrap b/script/bootstrap
@@ -29,7 +29,7 @@
 set -e
 
 echo "------------------------------"
-echo "--- bootstrap | 2024-04-23 ---"
+echo "--- bootstrap | 2024-04-24 ---"
 echo "------------------------------"
 
 UPDATE_ALL_SYSTEM_PACKAGES="$1"
@@ -1198,6 +1198,7 @@ function bootstrapOnRedHat ()
       dnf -y install \
                           git \
                           cmake \
+                          python3.11-devel \
                           boost-devel \
                           boost-python3-devel \
                           freeglut-devel \
@@ -1211,7 +1212,6 @@ function bootstrapOnRedHat ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
                           rpm-build \
                           make \
                           clang
@@ -1223,6 +1223,7 @@ function bootstrapOnRedHat ()
       dnf -y install \
                           git \
                           cmake \
+                          python3.11-devel \
                           boost-devel \
                           boost-python3-devel \
                           freeglut-devel \
@@ -1236,7 +1237,6 @@ function bootstrapOnRedHat ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
                           rpm-build \
                           make \
                           clang
@@ -1341,31 +1341,6 @@ function bootstrapOnRedHat ()
                           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 Red Hat is unsupported"
       exit 2
@@ -1601,6 +1576,7 @@ function bootstrapOnRockyLinux ()
       dnf -y install \
                           git \
                           cmake \
+                          python3.11-devel \
                           boost-devel \
                           boost-python3-devel \
                           freeglut-devel \
@@ -1614,7 +1590,6 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
                           rpm-build \
                           make \
                           clang
@@ -1628,6 +1603,7 @@ function bootstrapOnRockyLinux ()
       dnf -y install \
                           git \
                           cmake \
+                          python3.11-devel \
                           boost-devel \
                           boost-python3-devel \
                           freeglut-devel \
@@ -1641,7 +1617,6 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
                           rpm-build \
                           make \
                           clang
@@ -1746,31 +1721,6 @@ function bootstrapOnRockyLinux ()
                           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

diff --git a/script/cibuild b/script/cibuild
@@ -5,7 +5,7 @@
 # @usage  : script/cibuild
 # @param  : none
 #====================================
-# Copyright (C) 2020-2022 Stephen G. Tuggy and other Vega Strike contributors
+# Copyright (C) 2020-2024 Stephen G. Tuggy and other Vega Strike contributors
 #
 # This file is part of Vega Strike.
 #
@@ -24,9 +24,9 @@
 
 set -e
 
+DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')"
+docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" .
 if [ "${IS_RELEASE}" -eq 1 ]; then
-	DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')"
-	docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" .
 	# NOTE: Login done by a Git Hub Action prior to this script being run
 	docker push "$DOCKER_IMG_NAME"
 fi