Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

On master, drop Ubuntu 16.04 "Xenial" LTS and Debian 9 "stretch" #536

Merged
merged 7 commits into from
Sep 1, 2021
Merged

On master, drop Ubuntu 16.04 "Xenial" LTS and Debian 9 "stretch" #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06c0bf4
GitHub Actions: Drop Ubuntu 16.04 "Xenial" LTS and Debian 9 "stretch"
stephengtuggy Aug 30, 2021
8cfa804
GH Actions: Drop obsolete `matrix.FLAGS`
stephengtuggy Aug 30, 2021
32c7bfe
Update script/bootstrap to mirror what's on build-system-docker-images
stephengtuggy Aug 31, 2021
2fe82ef
CMakeLists.txt: Drop xenial and stretch; update CMAKE_MINIMUM_REQUIRED
stephengtuggy Aug 31, 2021
96d4223
script/bootstrap: Update copyright, last modified date
stephengtuggy Aug 31, 2021
65a0736
Setting CMAKE_MINIMUM_REQUIRED VERSION back to 3.5; 3.11 caused issues
stephengtuggy Aug 31, 2021
577739e
`#!/bin/bash` to `#!/usr/bin/env bash` at top of each shell script
stephengtuggy Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions .github/workflows/gh-actions-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,58 +13,36 @@ jobs:
include:
- FROM: 'ubuntu:hirsute'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:hirsute'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:groovy'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:groovy'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:focal'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:focal'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:bionic'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:bionic'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'ubuntu:xenial'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'linuxmintd/mint20-amd64'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'debian:bullseye'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'debian:buster'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'debian:stretch'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'opensuse/leap'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'fedora:34'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'fedora:33'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'fedora:32'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
- FROM: 'rockylinux/rockylinux'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'

steps:
- name: Checkout repository
Expand All @@ -83,7 +61,7 @@ jobs:
env:
FROM: ${{ matrix.FROM }}
COMPILER: ${{ matrix.COMPILER }}
FLAGS: ${{ matrix.FLAGS }}
FLAGS: ''
MY_OS_NAME: linux
IS_RELEASE: 0
run: script/cibuild $FLAGS
23 changes: 1 addition & 22 deletions .github/workflows/gh-actions-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,64 +17,43 @@ jobs:
include:
- FROM: 'ubuntu:hirsute'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'ubuntu:groovy'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'ubuntu:focal'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
# Source tarballs only
- FROM: 'ubuntu:focal'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'tar.[xb]z*'
- FROM: 'ubuntu:bionic'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'ubuntu:xenial'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'linuxmintd/mint20-amd64'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:bullseye'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:buster'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:stretch'
COMPILER: 'gcc'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'deb'
- FROM: 'opensuse/leap'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:34'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:33'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:32'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'rockylinux/rockylinux'
COMPILER: 'clang'
FLAGS: '-DUSE_PYTHON_3=ON'
ARTIFACT_EXT: 'rpm'

steps:
Expand All @@ -100,7 +79,7 @@ jobs:
env:
FROM: ${{ matrix.FROM }}
COMPILER: ${{ matrix.COMPILER }}
FLAGS: ${{ matrix.FLAGS }}
FLAGS: ''
MY_OS_NAME: linux
IS_RELEASE: 1
run: script/cibuild $FLAGS
Expand Down
39 changes: 3 additions & 36 deletions engine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,15 +843,6 @@ IF (USE_SYSTEM_BOOST)
SET(BOOST_PYTHON_COMPONENT "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
ELSE (Boost_1_67_Or_Later_Result)
SET(BOOST_PYTHON_COMPONENT "python3")

# Debian and Debian-based systems up to Boost 1.67 lack libboost_python3.{so|a}
# but have libboost_python-py{major}{minor}.{so|a}. E.g., Ubuntu xenial and
# Debian stretch.
IF (CMAKE_SYSTEM_NAME STREQUAL Linux)
IF (LINUX_CODENAME STREQUAL xenial OR LINUX_CODENAME STREQUAL stretch)
SET(BOOST_PYTHON_COMPONENT "python-py3${PYTHON_VERSION_MINOR}")
ENDIF (LINUX_CODENAME STREQUAL xenial OR LINUX_CODENAME STREQUAL stretch)
ENDIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
ENDIF (Boost_1_67_Or_Later_Result)
UNSET(Boost_1_67_Or_Later_Result)

Expand Down Expand Up @@ -1367,29 +1358,13 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62-turbo, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1, libopengl0, libglu1-mesa, libboost-atomic${BOOST_VER}, libboost-chrono${BOOST_VER}, libboost-date-time${BOOST_VER}, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSEIF (DEBIAN_RELEASE_VERSION STREQUAL "stretch")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.5")
IF (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "1.62.0")
ELSE (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62-turbo, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1, libopengl0, libboost-atomic${BOOST_VER}, libboost-chrono${BOOST_VER}, libboost-date-time${BOOST_VER}, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSE (DEBIAN_RELEASE_VERSION STREQUAL "bullseye")
MESSAGE(SEND_WARNING "!! Unsupported Debian version.")
ENDIF (DEBIAN_RELEASE_VERSION STREQUAL "bullseye")

ELSE (USE_DEBIAN_VERSION)
# Ubuntu Dependency Chain
IF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "xenial")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.5")
IF (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "1.58.0")
ELSE (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1-mesa-glx, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSEIF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "bionic")
IF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "bionic")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.7")
IF (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "1.65.1")
Expand All @@ -1413,14 +1388,6 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62-turbo, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1, libopengl0, libglu1-mesa, libboost-atomic${BOOST_VER}, libboost-chrono${BOOST_VER}, libboost-date-time${BOOST_VER}, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSEIF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "stretch")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.5")
IF (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "1.62.0")
ELSE (Boost_DERIVED_VERSION STREQUAL "")
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62-turbo, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1, libopengl0, libboost-atomic${BOOST_VER}, libboost-chrono${BOOST_VER}, libboost-date-time${BOOST_VER}, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSEIF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "bullseye")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.9")
IF (Boost_DERIVED_VERSION STREQUAL "")
Expand Down Expand Up @@ -1453,9 +1420,9 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(BOOST_VER "${Boost_DERIVED_VERSION}")
ENDIF (Boost_DERIVED_VERSION STREQUAL "")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjpeg62-turbo, libpng16-16, freeglut3, libgtk-3-0, libvorbis0a, libopenal1, libsdl-gfx1.2-5, xdg-utils, libgl1, libopengl0, libglu1-mesa, libboost-atomic${BOOST_VER}, libboost-chrono${BOOST_VER}, libboost-date-time${BOOST_VER}, libboost-filesystem${BOOST_VER}, libboost-log${BOOST_VER}, libboost-python${BOOST_VER}, libboost-regex${BOOST_VER}, libboost-system${BOOST_VER}, libboost-thread${BOOST_VER}")
ELSE (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "xenial")
ELSE (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "bionic")
MESSAGE(SEND_WARNING "!! Unsupported Debian derivative.")
ENDIF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "xenial")
ENDIF (LSB_LINUX_DISTRIBUTION_CODENAME STREQUAL "bionic")

ENDIF (USE_DEBIAN_VERSION)
ENDIF (EXISTS "${CMAKE_BINARY_DIR}/dependency.list")
Expand Down
76 changes: 11 additions & 65 deletions script/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash
#!/usr/bin/env bash
#====================================
# @file : bootstrap
# @brief : installs dependencies for building Vega Strike
# @usage : sudo script/bootstrap
# @param : none
#====================================
# Copyright (C) 2020-2021 Stephen G. Tuggy <sgt@stephengtuggy.com>
# Copyright (C) 2020-2021 Stephen G. Tuggy
#
# This file is part of Vega Strike.
#
Expand All @@ -25,7 +25,7 @@
set -e

echo "------------------------------"
echo "--- bootstrap | 2021-08-04 ---"
echo "--- bootstrap | 2021-08-30 ---"
echo "------------------------------"

if [ -f /etc/os-release ]
Expand Down Expand Up @@ -80,36 +80,6 @@ then
apt-get -qy install \
git \
cmake \
python-dev \
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-python1.67-dev \
libboost-log1.67-dev \
libboost-regex1.67-dev \
libxmu-dev \
clang \
lsb-release
elif [ $LINUX_ID == "debian" ] && [ $LINUX_CODENAME == "stretch" ]
then
apt-get update
apt-get -qy install \
git \
cmake \
python-dev \
build-essential \
automake \
autoconf \
Expand Down Expand Up @@ -198,7 +168,6 @@ then
apt-get -qy install \
git \
cmake \
python-dev \
build-essential \
automake \
autoconf \
Expand All @@ -216,40 +185,17 @@ then
libopengl0 \
libpostproc-dev \
freeglut3-dev \
libboost-python1.67-dev \
libboost-log1.67-dev \
libboost-regex1.67-dev \
libxmu-dev \
clang \
lsb-release
elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "bionic" ]
then
apt-get update
apt-get -qy install \
git \
cmake \
build-essential \
python-dev \
libgl1-mesa-glx \
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
elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ]
elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "bionic" ]
then
apt-get update
apt-get -qy install \
git \
cmake \
build-essential \
libgl1-mesa-glx \
freeglut3-dev \
Expand All @@ -265,14 +211,14 @@ then
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
apt-get -qy install \
git \
cmake \
python-dev \
build-essential \
automake \
autoconf \
Expand All @@ -290,13 +236,13 @@ then
libopengl0 \
libpostproc-dev \
freeglut3-dev \
libboost-python1.67-dev \
libboost-log1.67-dev \
libboost-regex1.67-dev \
libboost-python-dev \
libboost-log-dev \
libboost-regex-dev \
libxmu-dev \
clang \
lsb-release
elif [ $LINUX_ID == "opensuse-leap" ] && ([ $LINUX_VERSION_ID == "15.2" ] || [ $LINUX_VERSION_ID == "15.3" ])
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 ])
then
zypper --non-interactive install -y \
libboost_log1_66_0-devel \
Expand Down Expand Up @@ -431,7 +377,7 @@ then
rpm-build \
make \
clang
elif [ $LINUX_ID == "rocky" ] && [ $LINUX_VERSION_ID == "8.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
Expand Down
2 changes: 1 addition & 1 deletion script/build-authors.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/bin/bash is actually guaranteed to be there per Linux Standard Base.
/usr/bin/env is not.

There's various arguments either way for most things, and most scripts engines it can make sense. However, /bin/bash and /bin/sh are two that have to be around for a basic system to function and can be directly relied upon so they don't make sense to export out to /usr/bin/env.

$0.02

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I can look this up later, I suppose. Anyway, thanks for approving the PR

set -e


Expand Down
2 changes: 1 addition & 1 deletion script/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#====================================
# @file : build.sh
# @brief : build VegaStrike
Expand Down
5 changes: 2 additions & 3 deletions script/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/bin/bash
#!/usr/bin/env bash
#====================================
# @file : cibuild
# @brief : Builds Vega Strike for
# purposes of CI/CD (Travis)
# @brief : Builds Vega Strike for purposes of CI/CD (GitHub Actions)
# @usage : ./script/cibuild
# @param : none
#====================================
Expand Down
2 changes: 1 addition & 1 deletion script/clean
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#====================================
# @file : clean
# @brief : cleans VegaStrike build
Expand Down
Loading