bootstrap script, GH Actions: Uncomment Xenial and stretch

vegastrike · Sep 17, 2021 · bb3f7c9 · bb3f7c9
1 parent e2d5ead
commit bb3f7c9
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 60 deletions.
diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
@@ -25,11 +25,11 @@ jobs:
           - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
-        #   - FROM:     'ubuntu:xenial'
+          - FROM:     'ubuntu:xenial'
           - FROM:     'linuxmintd/mint20-amd64'
           - FROM:     'debian:bullseye'
           - FROM:     'debian:buster'
-        #   - FROM:     'debian:stretch'
+          - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
           - FROM:     'fedora:34'
           - FROM:     'fedora:33'

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -15,11 +15,11 @@ jobs:
           - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
-        #   - FROM:     'ubuntu:xenial'
+          - FROM:     'ubuntu:xenial'
           - FROM:     'linuxmintd/mint20-amd64'
           - FROM:     'debian:bullseye'
           - FROM:     'debian:buster'
-        #   - FROM:     'debian:stretch'
+          - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
           - FROM:     'fedora:34'
           - FROM:     'fedora:33'

diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
@@ -22,11 +22,11 @@ jobs:
           - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
-        #   - FROM:     'ubuntu:xenial'
+          - FROM:     'ubuntu:xenial'
           - FROM:     'linuxmintd/mint20-amd64'
           - FROM:     'debian:bullseye'
           - FROM:     'debian:buster'
-        #   - FROM:     'debian:stretch'
+          - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
           - FROM:     'fedora:34'
           - FROM:     'fedora:33'

diff --git a/script/bootstrap b/script/bootstrap
@@ -106,36 +106,36 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release
-# elif [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "stretch" ]
-# then
-#     apt-get update
-#     apt-get -qy upgrade
-#     apt-get -qy install \
-#                     git \
-#                     build-essential \
-#                     automake \
-#                     autoconf \
-#                     libpng16-16 \
-#                     libpng-dev \
-#                     libpng-tools \
-#                     libjpeg62-turbo-dev \
-#                     libexpat1-dev \
-#                     libgtk-3-dev \
-#                     libopenal-dev \
-#                     libogg-dev \
-#                     libvorbis-dev \
-#                     libglvnd-dev \
-#                     libsdl1.2-dev \
-#                     libpostproc-dev \
-#                     freeglut3-dev \
-#                     libboost-python-dev \
-#                     libboost-log-dev \
-#                     libboost-regex-dev \
-#                     libxmu-dev \
-#                     clang \
-#                     lsb-release \
-#                     python3-pip
-#     pip3 install --upgrade-strategy eager cmake
+elif [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "stretch" ]
+then
+    apt-get update
+    apt-get -qy upgrade
+    apt-get -qy install \
+                    git \
+                    build-essential \
+                    automake \
+                    autoconf \
+                    libpng16-16 \
+                    libpng-dev \
+                    libpng-tools \
+                    libjpeg62-turbo-dev \
+                    libexpat1-dev \
+                    libgtk-3-dev \
+                    libopenal-dev \
+                    libogg-dev \
+                    libvorbis-dev \
+                    libgl1-mesa-dev \
+                    libsdl1.2-dev \
+                    libpostproc-dev \
+                    freeglut3-dev \
+                    libboost-python-dev \
+                    libboost-log-dev \
+                    libboost-regex-dev \
+                    libxmu-dev \
+                    clang \
+                    lsb-release \
+                    python3-pip
+    pip3 install --upgrade-strategy eager cmake
 elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ]
 then
     apt-get update
@@ -255,30 +255,30 @@ then
                     lsb-release \
                     python3-pip
     pip3 install --upgrade-strategy eager cmake
-# elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ]
-# then
-#     apt-get update
-#     apt-get -qy upgrade
-#     apt-get -qy install \
-#                     git \
-#                     build-essential \
-#                     libglvnd-dev \
-#                     freeglut3-dev \
-#                     libopenal-dev \
-#                     libsdl-gfx1.2-dev \
-#                     libvorbis-dev \
-#                     libjpeg-dev \
-#                     libpng-dev \
-#                     libgtk-3-dev \
-#                     libboost-python-dev \
-#                     libboost-log-dev \
-#                     libboost-regex-dev \
-#                     libxmu-dev \
-#                     clang \
-#                     lsb-release \
-#                     python3-dev \
-#                     python3-pip
-#     pip3 install --upgrade-strategy eager cmake
+elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ]
+then
+    apt-get update
+    apt-get -qy upgrade
+    apt-get -qy install \
+                    git \
+                    build-essential \
+                    libgl1-mesa-dev \
+                    freeglut3-dev \
+                    libopenal-dev \
+                    libsdl-gfx1.2-dev \
+                    libvorbis-dev \
+                    libjpeg-dev \
+                    libpng-dev \
+                    libgtk-3-dev \
+                    libboost-python-dev \
+                    libboost-log-dev \
+                    libboost-regex-dev \
+                    libxmu-dev \
+                    clang \
+                    lsb-release \
+                    python3-dev \
+                    python3-pip
+    pip3 install --upgrade-strategy eager cmake
 elif [ $LINUX_ID == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ]
 then
     apt-get update