From 0dedc933e6a21c8262c77f87537bc4fb1a47db48 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 16:45:37 -0700 Subject: [PATCH 1/7] script/bootstrap: Switch to libglvnd-dev on .deb-based Linux distros --- script/bootstrap | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index a50ed78..5dae12a 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -25,7 +25,7 @@ set -e echo "------------------------------" -echo "--- bootstrap | 2021-08-29 ---" +echo "--- bootstrap | 2021-09-16 ---" echo "------------------------------" if [ -f /etc/os-release ] @@ -65,7 +65,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ @@ -94,7 +94,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ @@ -123,7 +123,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ @@ -153,7 +153,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -184,7 +184,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -214,7 +214,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -232,7 +232,7 @@ then apt-get -qy install \ git \ build-essential \ - libgl1-mesa-glx \ + libglvnd-dev \ freeglut3-dev \ libopenal-dev \ libsdl-gfx1.2-dev \ @@ -256,7 +256,7 @@ then git \ cmake \ build-essential \ - libgl1-mesa-glx \ + libglvnd-dev \ freeglut3-dev \ libopenal-dev \ libsdl-gfx1.2-dev \ @@ -290,7 +290,7 @@ then libopenal-dev \ libogg-dev \ libvorbis-dev \ - libgl1-mesa-dev \ + libglvnd-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ From c454566fd7c50fc47dfe65e5ce722fdbc7ce0e75 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 16:48:25 -0700 Subject: [PATCH 2/7] script/bootstrap: Install cmake via pip3 on Xenial and stretch --- script/bootstrap | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 5dae12a..d7830d4 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -110,7 +110,6 @@ then apt-get -qy upgrade apt-get -qy install \ git \ - cmake \ build-essential \ automake \ autoconf \ @@ -132,7 +131,9 @@ then libboost-regex-dev \ libxmu-dev \ clang \ - lsb-release + lsb-release \ + python3-pip + pip3 install --upgrade-strategy eager cmake elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ] then apt-get update @@ -254,7 +255,6 @@ then apt-get -qy upgrade apt-get -qy install \ git \ - cmake \ build-essential \ libglvnd-dev \ freeglut3-dev \ @@ -270,7 +270,9 @@ then libxmu-dev \ clang \ lsb-release \ - python3-dev + python3-dev \ + python3-pip + pip3 install --upgrade-strategy eager cmake elif [ $LINUX_ID == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ] then apt-get update From 3a2fd7770aab613310576a0444217b993bb71129 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 16:51:07 -0700 Subject: [PATCH 3/7] .github/workflows/fortify-on-demand-scan.yml: Run manually only --- .github/workflows/fortify-on-demand-scan.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/fortify-on-demand-scan.yml b/.github/workflows/fortify-on-demand-scan.yml index 3c6e603..57bdccf 100644 --- a/.github/workflows/fortify-on-demand-scan.yml +++ b/.github/workflows/fortify-on-demand-scan.yml @@ -1,11 +1,9 @@ name: Fortify on Demand Scan -# Controls when the action will run. +# Controls when the action will run. on: - push: - # branches: ['master', '[0-9]?.[0-9]?.x'] - pull_request: - # branches: ['master', '[0-9]?.[0-9]?.x'] +# push: +# pull_request: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 9894cb18110b24386d41edf1c0622a6a0949fe52 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 17:06:06 -0700 Subject: [PATCH 4/7] bootstrap script, GH Actions: Comment out Xenial, stretch --- .github/workflows/Anchore-Container-Scan.yml | 8 +- .github/workflows/gh-actions-pr.yml | 4 +- .github/workflows/gh-actions-release.yml | 4 +- script/bootstrap | 108 +++++++++---------- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml index 706653a..5253710 100644 --- a/.github/workflows/Anchore-Container-Scan.yml +++ b/.github/workflows/Anchore-Container-Scan.yml @@ -1,6 +1,6 @@ name: Anchore-Container-Scan -# Controls when the action will run. +# Controls when the action will run. on: # Triggers the workflow on push or pull request events but only for the master branch push: @@ -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' @@ -43,7 +43,7 @@ jobs: with: fetch-depth: 2 submodules: false - + # - name: Run CI # env: # FROM: ${{ matrix.FROM }} diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index b5cead4..8acda99 100644 --- 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 index 15aa73b..b9c5673 100644 --- 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 index d7830d4..6c04e55 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -104,36 +104,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 \ +# 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 == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ] then apt-get update @@ -249,30 +249,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 \ +# 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 == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ] then apt-get update From e2d5eade5552eaef8d536dc476cdc267d4d9d4d5 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 17:52:06 -0700 Subject: [PATCH 5/7] script/bootstrap: Add Mesa back in, alongside GLVND --- script/bootstrap | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/script/bootstrap b/script/bootstrap index 6c04e55..04a2501 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -66,6 +66,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ @@ -95,6 +96,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ @@ -155,6 +157,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -186,6 +189,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -216,6 +220,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ @@ -234,6 +239,7 @@ then git \ build-essential \ libglvnd-dev \ + libgl1-mesa-dev \ freeglut3-dev \ libopenal-dev \ libsdl-gfx1.2-dev \ @@ -293,6 +299,7 @@ then libogg-dev \ libvorbis-dev \ libglvnd-dev \ + libgl1-mesa-dev \ libsdl1.2-dev \ libopengl0 \ libpostproc-dev \ From bb3f7c9fdb04dd4d05d02857eb0a336af6f54924 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 18:05:03 -0700 Subject: [PATCH 6/7] bootstrap script, GH Actions: Uncomment Xenial and stretch --- .github/workflows/Anchore-Container-Scan.yml | 4 +- .github/workflows/gh-actions-pr.yml | 4 +- .github/workflows/gh-actions-release.yml | 4 +- script/bootstrap | 108 +++++++++---------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml index 5253710..d2d3ff3 100644 --- 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 index 8acda99..b5cead4 100644 --- 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 index b9c5673..15aa73b 100644 --- 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 index 04a2501..3de5168 100755 --- 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 From 73d59f61c41b53ed71d52d1c11df3f9724695e8b Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Thu, 16 Sep 2021 18:31:07 -0700 Subject: [PATCH 7/7] pip3 on Xenial is too old to support `--upgrade-strategy` option --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 3de5168..1f1783b 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -278,7 +278,7 @@ then lsb-release \ python3-dev \ python3-pip - pip3 install --upgrade-strategy eager cmake + pip3 install cmake elif [ $LINUX_ID == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ] then apt-get update