Merge pull request #26 from stephengtuggy/feat/ubuntu-jammy

Add Ubuntu Jammy, Fedora 36, Manjaro, openSUSE Leap 15.4
vegastrike · Jun 11, 2022 · d3d964d · d3d964d
2 parents 0d40650 + 3c82dd4
commit d3d964d
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 23 deletions.
diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
@@ -21,6 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - FROM:     'ubuntu:jammy'
           - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
           - FROM:     'ubuntu:focal'
@@ -31,9 +32,11 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:36'
           - FROM:     'fedora:35'
           - FROM:     'fedora:34'
           - FROM:     'rockylinux/rockylinux'
+          - FROM:     'manjarolinux/base'
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -11,6 +11,7 @@ jobs:
       fail-fast: true
       matrix:
         include:
+          - FROM:     'ubuntu:jammy'
           - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
           - FROM:     'ubuntu:focal'
@@ -21,9 +22,11 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:36'
           - FROM:     'fedora:35'
           - FROM:     'fedora:34'
           - FROM:     'rockylinux/rockylinux'
+          - FROM:     'manjarolinux/base'
 
     steps:
     - name: Checkout repository

diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
@@ -18,6 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - FROM:     'ubuntu:jammy'
           - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
           - FROM:     'ubuntu:focal'
@@ -28,9 +29,11 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:36'
           - FROM:     'fedora:35'
           - FROM:     'fedora:34'
           - FROM:     'rockylinux/rockylinux'
+          - FROM:     'manjarolinux/base'
 
     steps:
     - name: Checkout repository

diff --git a/script/bootstrap b/script/bootstrap
@@ -5,7 +5,7 @@
 # @usage  : sudo script/bootstrap
 # @param  : none
 #====================================
-# Copyright (C) 2020-2021 Stephen G. Tuggy
+# Copyright (C) 2020-2022 Stephen G. Tuggy
 #
 # This file is part of Vega Strike.
 #
@@ -25,7 +25,7 @@
 set -e
 
 echo "------------------------------"
-echo "--- bootstrap | 2021-12-12 ---"
+echo "--- bootstrap | 2022-06-11 ---"
 echo "------------------------------"
 
 if [ -f /etc/os-release ]
@@ -45,7 +45,7 @@ echo "LINUX_CODENAME = ${LINUX_CODENAME}"
 export LINUX_VERSION_ID=$(cat $OS_RELEASE_LOCATION | grep ^VERSION_ID= | sed 's/^VERSION_ID=//' | tr -d '"\n')
 echo "LINUX_VERSION_ID = ${LINUX_VERSION_ID}"
 
-if [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "bullseye" ]
+if [ "$LINUX_ID" == "debian" ] && [ "$LINUX_CODENAME" == "bullseye" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -76,7 +76,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "buster" ]
+elif [ "$LINUX_ID" == "debian" ] && [ "$LINUX_CODENAME" == "buster" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -106,7 +106,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "stretch" ]
+elif [ "$LINUX_ID" == "debian" ] && [ "$LINUX_CODENAME" == "stretch" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -136,7 +136,7 @@ then
                     lsb-release \
                     python3-pip
     pip3 install --upgrade-strategy eager cmake
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "impish" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "jammy" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -169,7 +169,40 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "impish" ]
+then
+    apt-get update
+    apt-get -qy upgrade
+    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-dev \
+                    libopengl0 \
+                    libpostproc-dev \
+                    freeglut3-dev \
+                    libboost-python-dev \
+                    libboost-log-dev \
+                    libboost-regex-dev \
+                    libxmu-dev \
+                    clang \
+                    lsb-release
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "hirsute" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -201,7 +234,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "groovy" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "groovy" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -233,7 +266,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "focal" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "focal" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -264,7 +297,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "bionic" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "bionic" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -288,7 +321,7 @@ then
                     lsb-release \
                     python3-pip
     pip3 install --upgrade-strategy eager cmake
-elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ]
+elif [ "$LINUX_ID" == "ubuntu" ] && [ "$LINUX_CODENAME" == "xenial" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -312,7 +345,7 @@ then
                     python3-dev \
                     python3-pip
     pip3 install cmake
-elif [ $LINUX_ID == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ]
+elif [ "$LINUX_ID" == "linuxmint" ] && [ "$LINUX_CODENAME" == "ulyana" ]
 then
     apt-get update
     apt-get -qy upgrade
@@ -343,7 +376,7 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-elif [ $LINUX_ID == "opensuse-leap" ] && ([ $(echo ${LINUX_VERSION_ID} | cut -f 1 -d '.') -eq 15 ] && [ $(echo ${LINUX_VERSION_ID} | cut -f 2 -d '.') -ge 2 ])
+elif [ "$LINUX_ID" == "opensuse-leap" ] && ([ "${LINUX_VERSION_ID}" == "15.2" ] || [ "${LINUX_VERSION_ID}" == "15.3" ])
 then
     zypper --non-interactive install -y \
                             libboost_log1_66_0-devel \
@@ -374,7 +407,38 @@ then
                             git \
                             rpm-build \
                             clang
-elif [ $LINUX_ID == "fedora" ] && ([ $LINUX_VERSION_ID -ge 34 ] && [ $LINUX_VERSION_ID -lt 36 ])
+elif [ "$LINUX_ID" == "opensuse-leap" ] && [ "${LINUX_VERSION_ID}" == "15.4" ]
+then
+    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 \
+                            cmake \
+                            gcc-c++ \
+                            freeglut-devel \
+                            libopenal0 \
+                            openal-soft-devel \
+                            libSDL-1_2-0 \
+                            libSDL-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
+elif [ "$LINUX_ID" == "fedora" ] && ([ "$LINUX_VERSION_ID" -ge 34 ] && [ "$LINUX_VERSION_ID" -lt 37 ])
 then
     dnf install -y \
                         git \
@@ -394,7 +458,7 @@ then
                         rpm-build \
                         make \
                         clang
-elif [ $LINUX_ID == "fedora" ] && ([ $LINUX_VERSION_ID -ge 32 ] && [ $LINUX_VERSION_ID -lt 34 ])
+elif [ "$LINUX_ID" == "fedora" ] && ([ $LINUX_VERSION_ID -ge 32 ] && [ $LINUX_VERSION_ID -lt 34 ])
 then
     dnf install -y \
                         git \
@@ -414,7 +478,7 @@ then
                         rpm-build \
                         make \
                         clang
-elif [ $LINUX_ID == "fedora" ] && ([ $LINUX_VERSION_ID -ge 30 ] && [ $LINUX_VERSION_ID -lt 32 ])
+elif [ "$LINUX_ID" == "fedora" ] && ([ $LINUX_VERSION_ID -ge 30 ] && [ $LINUX_VERSION_ID -lt 32 ])
 then
     dnf install -y \
                         git \
@@ -434,7 +498,7 @@ then
                         rpm-build \
                         make \
                         clang
-elif [ $LINUX_ID == "centos" ] && [ $LINUX_VERSION_ID -eq 8 ]
+elif [ "$LINUX_ID" == "centos" ] && [ $LINUX_VERSION_ID -eq 8 ]
 then
     dnf -y install dnf-plugins-core
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
@@ -457,7 +521,7 @@ then
                         rpm-build \
                         make \
                         clang
-elif ([ $LINUX_ID == "rhel" ] || [ $LINUX_ID == "redhat" ]) && [ $LINUX_VERSION_ID -eq 8 ]
+elif ([ "$LINUX_ID" == "rhel" ] || [ "$LINUX_ID" == "redhat" ]) && [ $LINUX_VERSION_ID -eq 8 ]
 then
     dnf -y install dnf-plugins-core
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
@@ -481,7 +545,7 @@ then
                         rpm-build \
                         make \
                         clang
-elif [ $LINUX_ID == "rocky" ] && ([ $(echo ${LINUX_VERSION_ID} | cut -f 1 -d '.') -eq 8 ] && [ $(echo ${LINUX_VERSION_ID} | cut -f 2 -d '.') -ge 4 ])
+elif [ "$LINUX_ID" == "rocky" ] && ([ $(echo "${LINUX_VERSION_ID}" | cut -f 1 -d '.') -eq 8 ] && [ $(echo "${LINUX_VERSION_ID}" | cut -f 2 -d '.') -ge 4 ])
 then
     dnf -y install dnf-plugins-core
     dnf -y install epel-release
@@ -507,6 +571,28 @@ then
                         rpm-build \
                         make \
                         clang
+elif [ "$LINUX_ID" == "manjaro" ]
+then
+    pacman -S --refresh --noconfirm cmake \
+                   boost \
+                   clang \
+                   gcc \
+                   gcc-libs \
+                   sdl \
+                   expat \
+                   gtk3 \
+                   libglvnd \
+                   mesa \
+                   python \
+                   autoconf \
+                   automake \
+                   freeglut \
+                   git \
+                   libjpeg-turbo \
+                   libpng \
+                   libvorbis \
+                   libxmu \
+                   openal
 else
     echo "Unsupported Linux distribution"
     exit 2

diff --git a/script/cibuild b/script/cibuild
@@ -5,7 +5,7 @@
 # @usage  : script/cibuild
 # @param  : none
 #====================================
-# Copyright (C) 2020-2021 Stephen G. Tuggy
+# Copyright (C) 2020-2022 Stephen G. Tuggy
 #
 # This file is part of Vega Strike.
 #
@@ -25,10 +25,10 @@
 set -e
 
 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 .
+	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
+	docker push "$DOCKER_IMG_NAME"
 fi
 
 echo "cibuild Done!"