Skip to content

Commit 4498a22

Browse files
authored
Removed Ubuntu 22.04 Support
- The code has been updated to remove support for Ubuntu 22.04, as it is no longer supported by EngineScript. - The CI configuration and installation scripts have been modified to only support Ubuntu 24.04. - The error messages and repository configurations have been adjusted accordingly.
1 parent ca2c5dd commit 4498a22

4 files changed

Lines changed: 7 additions & 23 deletions

File tree

.github/workflows/enginescript-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
UBUNTU_VERSION="$(lsb_release -sr)"
119119
120120
if [ "$LINUX_TYPE" != "Ubuntu" ]; then
121-
echo "EngineScript does not support $LINUX_TYPE. Please use Ubuntu 22.04 or 24.04" | sudo tee -a /tmp/ci-logs/setup.log
121+
echo "EngineScript does not support $LINUX_TYPE. Please use Ubuntu 24.04" | sudo tee -a /tmp/ci-logs/setup.log
122122
exit 1
123123
fi
124124
echo "✅ Detected Linux Type: $LINUX_TYPE" | sudo tee -a /tmp/ci-logs/setup.log

scripts/install/gcc/gcc-install.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,10 @@ source /home/EngineScript/enginescript-install-options.txt
2222
update-alternatives --remove-all gcc
2323
echo "Ignore the error above on fresh installs."
2424

25-
UBUNTU_VERSION="$(lsb_release -sr)"
26-
if [[ "${UBUNTU_VERSION}" == "22.04" ]];
27-
then
28-
# Install GCC for Ubuntu 22.04
29-
apt install g++-11 gcc-11 g++-12 gcc-12 -y
30-
31-
# Create new GCC alternatives
32-
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
33-
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 90 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
34-
fi
35-
3625
UBUNTU_VERSION="$(lsb_release -sr)"
3726
if [[ "${UBUNTU_VERSION}" == "24.04" ]];
3827
then
39-
# Install GCC for Ubuntu 22.04
28+
# Install GCC for Ubuntu 24.04
4029
apt install g++-13 gcc-13 g++-14 gcc-14 -y
4130

4231
# Create new GCC alternatives

scripts/install/repositories/repositories-install.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/source
106106

107107
# Version Specific Repositories
108108
UBUNTU_VERSION="$(lsb_release -sr)"
109-
if [[ "${UBUNTU_VERSION}" == "22.04" ]]; then
110-
echo "Not adding any additional repositories for Ubuntu Jammy 22.04"
111-
# phpMyAdmin
112-
#add-apt-repository -yn ppa:phpmyadmin/ppa
113-
else
109+
if [[ "${UBUNTU_VERSION}" == "24.04" ]]; then
114110
echo "Skipping repos that don't support Ubuntu Noble 24.04"
115111
fi

setup.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,19 @@ fi
3131
LINUX_TYPE=$(lsb_release -i | cut -d':' -f 2 | tr -d '[:space:]')
3232

3333
if [[ "$LINUX_TYPE" != "Ubuntu" ]]; then
34-
echo "EngineScript does not support $LINUX_TYPE. Please use Ubuntu 22.04 or 24.04"
34+
echo "EngineScript does not support $LINUX_TYPE. Please use Ubuntu 24.04"
3535
exit 1
3636
else
3737
echo "Detected Linux Type: $LINUX_TYPE"
3838
fi
3939

40-
# Check if Ubuntu is LTS Release (22.04 or 24.04). If not, exit.
40+
# Check if Ubuntu is 24.04 LTS Release. If not, exit.
4141
UBUNTU_VERSION="$(lsb_release -sr)"
42-
Jammy=22.04
4342
Noble=24.04
4443

45-
if (( $(bc <<<"$UBUNTU_VERSION != $Jammy && $UBUNTU_VERSION != $Noble") )); then
44+
if (( $(bc <<<"$UBUNTU_VERSION != $Noble") )); then
4645
echo "ALERT:"
47-
echo "EngineScript does not support Ubuntu $UBUNTU_VERSION. We recommend using an Ubuntu LTS release (version 22.04 or 24.04)"
46+
echo "EngineScript does not support Ubuntu $UBUNTU_VERSION. We recommend using Ubuntu 24.04 LTS"
4847
exit 1
4948
else
5049
echo "Current Ubuntu Version: $UBUNTU_VERSION"

0 commit comments

Comments
 (0)