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

Update script/bootstrap, script/cibuild, and 2 GH Workflows: Anchore-… #48

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Update script/bootstrap, script/cibuild, and 2 GH Workflows: Anchore-… #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/Anchore-Container-Scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ jobs:
env:
FROM: ${{ matrix.FROM }}
MY_OS_NAME: linux
IS_RELEASE: 1
IS_RELEASE: 0

- name: build local container
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.3.0
env:
FROM: ${{ matrix.FROM }}
MY_OS_NAME: linux
IS_RELEASE: 1
IS_RELEASE: 0
with:
build-args: from=${{ matrix.FROM }}
tags: localbuild/${{ matrix.FROM }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gh-actions-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
# As opposed to the merge commit
- name: Move to PR HEAD
run: git checkout HEAD^2

- name: Run CI
env:
FROM: ${{ matrix.FROM }}
Expand Down
60 changes: 5 additions & 55 deletions script/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
set -e

echo "------------------------------"
echo "--- bootstrap | 2024-04-23 ---"
echo "--- bootstrap | 2024-04-24 ---"
echo "------------------------------"

UPDATE_ALL_SYSTEM_PACKAGES="$1"
Expand Down Expand Up @@ -1198,6 +1198,7 @@ function bootstrapOnRedHat ()
dnf -y install \
git \
cmake \
python3.11-devel \
Copy link
Member

Choose a reason for hiding this comment

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

FYI - we did python3-devel because it should be the latest on the platform, as opposed to tied to a specific version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I remember. However, that doesn't seem to work on Rocky Linux 8.9 for some reason. Maybe because they're keeping Python 3.9 as the default version, for backward compatibility with other 8.x releases.

boost-devel \
boost-python3-devel \
freeglut-devel \
Expand All @@ -1211,7 +1212,6 @@ function bootstrapOnRedHat ()
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
Expand All @@ -1223,6 +1223,7 @@ function bootstrapOnRedHat ()
dnf -y install \
git \
cmake \
python3.11-devel \
boost-devel \
boost-python3-devel \
freeglut-devel \
Expand All @@ -1236,7 +1237,6 @@ function bootstrapOnRedHat ()
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
Expand Down Expand Up @@ -1341,31 +1341,6 @@ function bootstrapOnRedHat ()
make \
clang
;;
"9.4")
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled devel
dnf -y update
dnf -y install \
git \
cmake \
boost-devel \
boost-python3-devel \
freeglut-devel \
gcc-c++ \
openal-soft-devel \
sdl12-compat-devel \
SDL2-devel \
libvorbis-devel \
libglvnd-devel \
libjpeg-turbo-devel \
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
;;
*)
echo "Sorry, this version of Red Hat is unsupported"
exit 2
Expand Down Expand Up @@ -1601,6 +1576,7 @@ function bootstrapOnRockyLinux ()
dnf -y install \
git \
cmake \
python3.11-devel \
boost-devel \
boost-python3-devel \
freeglut-devel \
Expand All @@ -1614,7 +1590,6 @@ function bootstrapOnRockyLinux ()
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
Expand All @@ -1628,6 +1603,7 @@ function bootstrapOnRockyLinux ()
dnf -y install \
git \
cmake \
python3.11-devel \
boost-devel \
boost-python3-devel \
freeglut-devel \
Expand All @@ -1641,7 +1617,6 @@ function bootstrapOnRockyLinux ()
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
Expand Down Expand Up @@ -1746,31 +1721,6 @@ function bootstrapOnRockyLinux ()
make \
clang
;;
"9.4")
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled devel
dnf -y update
dnf -y install \
git \
cmake \
boost-devel \
boost-python3-devel \
freeglut-devel \
gcc-c++ \
openal-soft-devel \
sdl12-compat-devel \
SDL2-devel \
libvorbis-devel \
libglvnd-devel \
libjpeg-turbo-devel \
libpng-devel \
expat-devel \
gtk3-devel \
python3-devel \
rpm-build \
make \
clang
;;
*)
echo "Sorry, this version of Rocky Linux is unsupported"
exit 2
Expand Down
6 changes: 3 additions & 3 deletions script/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @usage : script/cibuild
# @param : none
#====================================
# Copyright (C) 2020-2022 Stephen G. Tuggy and other Vega Strike contributors
# Copyright (C) 2020-2024 Stephen G. Tuggy and other Vega Strike contributors
#
# This file is part of Vega Strike.
#
Expand All @@ -24,9 +24,9 @@

set -e

DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')"
docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" .
if [ "${IS_RELEASE}" -eq 1 ]; then
DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')"
docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" .
# NOTE: Login done by a Git Hub Action prior to this script being run
docker push "$DOCKER_IMG_NAME"
fi
Expand Down
Loading