From ea649101682b4550d2adbd318976c4d13fe1fbbc Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 30 Sep 2023 00:27:45 -0400 Subject: [PATCH 1/3] Enhancement: SDL2 support Vega Strike is moving to use SDL2. Add support to the docker images for SDL2 in addition to SDL1. - add a tool to easily check that the script works locally - ignore Vi Swap files --- .gitignore | 1 + script/bootstrap | 14 ++++++++++++++ script/local-test-ci.sh | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100755 script/local-test-ci.sh diff --git a/.gitignore b/.gitignore index 7f4b696..25dfa63 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .editorconfig +*.sw? diff --git a/script/bootstrap b/script/bootstrap index 4722b9d..49104df 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -81,6 +81,7 @@ function bootstrapOnDebian() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libpostproc-dev \ freeglut3-dev \ libboost-python-dev \ @@ -110,6 +111,7 @@ function bootstrapOnDebian() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libpostproc-dev \ freeglut3-dev \ libboost-python-dev \ @@ -137,6 +139,7 @@ function bootstrapOnDebian() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libpostproc-dev \ freeglut3-dev \ libboost-python-dev \ @@ -167,6 +170,7 @@ function bootstrapOnDebian() libvorbis-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libpostproc-dev \ freeglut3-dev \ libboost-python-dev \ @@ -217,6 +221,7 @@ function bootstrapOnUbuntu() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -248,6 +253,7 @@ function bootstrapOnUbuntu() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -278,6 +284,7 @@ function bootstrapOnUbuntu() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -308,6 +315,7 @@ function bootstrapOnUbuntu() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -337,6 +345,7 @@ function bootstrapOnUbuntu() libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -356,6 +365,7 @@ function bootstrapOnUbuntu() freeglut3-dev \ libopenal-dev \ libsdl-gfx1.2-dev \ + libsdl2-dev \ libvorbis-dev \ libjpeg-dev \ libpng-dev \ @@ -412,6 +422,7 @@ function bootstrapOnPopOS () libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -460,6 +471,7 @@ function bootstrapOnLinuxMint () libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-compat-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -491,6 +503,7 @@ function bootstrapOnLinuxMint () libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ @@ -520,6 +533,7 @@ function bootstrapOnLinuxMint () libglvnd-dev \ libgl1-mesa-dev \ libsdl1.2-dev \ + libsdl2-dev \ libopengl0 \ libpostproc-dev \ freeglut3-dev \ diff --git a/script/local-test-ci.sh b/script/local-test-ci.sh new file mode 100755 index 0000000..be9982d --- /dev/null +++ b/script/local-test-ci.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +export FROM="debian:bullseye" +export MY_OS_NAME="linux" +export IS_RELEASE=0 + +#./script/cibuild +export DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')" +docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" . From be519199c5f0faa4999be9ca8262fb1e8b995b23 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 30 Sep 2023 00:38:45 -0400 Subject: [PATCH 2/3] CI: Debian Stretch no longer supported --- script/bootstrap | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 49104df..ea2f49d 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -154,34 +154,8 @@ function bootstrapOnDebian() apt-get -qy install cmake -t buster-backports ;; "stretch") - 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 \ - libsdl2-dev \ - libpostproc-dev \ - freeglut3-dev \ - libboost-python-dev \ - libboost-log-dev \ - libboost-regex-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 + echo "Sorry, Debian stretch is no longer supported" + exit 2 ;; *) echo "Sorry, this version of Debian is unsupported" From b96820b771a7b1aefd6da3e30db0134d93c9c14f Mon Sep 17 00:00:00 2001 From: Benjamen Meyer Date: Sat, 30 Sep 2023 00:51:59 -0400 Subject: [PATCH 3/3] Platform: Ubuntu Kinetic is no longer supported --- .github/workflows/Anchore-Container-Scan.yml | 1 - .github/workflows/gh-actions-pr.yml | 1 - .github/workflows/gh-actions-release.yml | 1 - script/bootstrap | 33 -------------------- 4 files changed, 36 deletions(-) diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml index 8cc9097..ca6033f 100644 --- a/.github/workflows/Anchore-Container-Scan.yml +++ b/.github/workflows/Anchore-Container-Scan.yml @@ -22,7 +22,6 @@ jobs: matrix: FROM: - 'ubuntu:lunar' - - 'ubuntu:kinetic' - 'ubuntu:jammy' - 'ubuntu:focal' - 'ubuntu:bionic' diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml index da2b359..560e757 100644 --- a/.github/workflows/gh-actions-pr.yml +++ b/.github/workflows/gh-actions-pr.yml @@ -12,7 +12,6 @@ jobs: matrix: FROM: - 'ubuntu:lunar' - - 'ubuntu:kinetic' - 'ubuntu:jammy' - 'ubuntu:focal' - 'ubuntu:bionic' diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml index 2d81bbf..e06afbd 100644 --- a/.github/workflows/gh-actions-release.yml +++ b/.github/workflows/gh-actions-release.yml @@ -19,7 +19,6 @@ jobs: matrix: FROM: - 'ubuntu:lunar' - - 'ubuntu:kinetic' - 'ubuntu:jammy' - 'ubuntu:focal' - 'ubuntu:bionic' diff --git a/script/bootstrap b/script/bootstrap index 2b21604..1c4f756 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -210,39 +210,6 @@ function bootstrapOnUbuntu() clang \ lsb-release ;; - "kinetic") - 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 \ - libsdl2-dev \ - libopengl0 \ - libpostproc-dev \ - freeglut3-dev \ - libboost-python-dev \ - libboost-log-dev \ - libboost-regex-dev \ - libboost-program-options-dev \ - libxmu-dev \ - clang \ - lsb-release - ;; "jammy") apt-get -qy install \ git \