Skip to content

Commit

Permalink
Merge pull request #42 from stephengtuggy/funtoo-clang
Browse files Browse the repository at this point in the history 
Add Fedora 38, Ubuntu Lunar, openSUSE Leap 15.5; troubleshoot Funtoo
  • Loading branch information
@stephengtuggy
stephengtuggy authored Jul 11, 2023
2 parents 80c6b4c + 056be8d commit 4326cc7
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 91 deletions.
63 changes: 32 additions & 31 deletions .github/workflows/Anchore-Container-Scan.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,39 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- FROM: 'ubuntu:kinetic'
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
- FROM: 'debian:bullseye'
- FROM: 'debian:buster'
- FROM: 'opensuse/leap'
- FROM: 'opensuse/leap:15.4'
- FROM: 'opensuse/leap:15.3'
- FROM: 'opensuse/leap:15.2'
- FROM: 'fedora:37'
- FROM: 'fedora:36'
- FROM: 'fedora:35'
- FROM: 'fedora:34'
- FROM: 'rockylinux/rockylinux'
- FROM: 'rockylinux:9.1'
- FROM: 'rockylinux:9.0'
- FROM: 'rockylinux:8.7'
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'
FROM:
- 'ubuntu:lunar'
- 'ubuntu:kinetic'
- 'ubuntu:jammy'
- 'ubuntu:focal'
- 'ubuntu:bionic'
- 'linuxmintd/mint21.1-amd64'
- 'linuxmintd/mint21-amd64'
- 'linuxmintd/mint20-amd64'
- 'debian:bookworm'
- 'debian:bullseye'
- 'debian:buster'
- 'opensuse/leap:15.5'
- 'opensuse/leap:15.4'
- 'opensuse/leap:15.3'
- 'opensuse/leap:15.2'
- 'fedora:38'
- 'fedora:37'
- 'fedora:36'
- 'fedora:35'
- 'fedora:34'
- 'rockylinux:9.1'
- 'rockylinux:9.0'
- 'rockylinux:8.7'
- 'rockylinux:8.6'
- 'rockylinux:8.5'
- 'manjarolinux/base'
- 'funtoo/stage3-generic_64'

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 #v3.5.0
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
with:
fetch-depth: 2
submodules: false
Expand All @@ -64,14 +65,14 @@ jobs:
# run: script/cibuild

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 #v2.2.1
uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 #v2.9.0
env:
FROM: ${{ matrix.FROM }}
MY_OS_NAME: linux
IS_RELEASE: 1

- name: build local container
uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 #v3.3.0
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 #v4.1.1
env:
FROM: ${{ matrix.FROM }}
MY_OS_NAME: linux
Expand All @@ -83,7 +84,7 @@ jobs:
load: true

- name: Scan image
uses: anchore/scan-action@9a22e4caae42db0d4c687ab5431e1c3699d0def1 #v3.3.2
uses: anchore/scan-action@24fd7c9060f3c96848dd1929fac8d796fb5ae4b4 #v3.3.6
with:
image: "localbuild/${{ matrix.FROM }}"
fail-build: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fortify-on-demand-scan.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3

- name: Fortify on Demand Scan
# You may pin to the exact commit or the version.
Expand Down
57 changes: 29 additions & 28 deletions .github/workflows/gh-actions-pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,38 @@ jobs:
strategy:
fail-fast: true
matrix:
include:
- FROM: 'ubuntu:kinetic'
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
- FROM: 'debian:bullseye'
- FROM: 'debian:buster'
- FROM: 'opensuse/leap'
- FROM: 'opensuse/leap:15.4'
- FROM: 'opensuse/leap:15.3'
- FROM: 'opensuse/leap:15.2'
- FROM: 'fedora:37'
- FROM: 'fedora:36'
- FROM: 'fedora:35'
- FROM: 'fedora:34'
- FROM: 'rockylinux/rockylinux'
- FROM: 'rockylinux:9.1'
- FROM: 'rockylinux:9.0'
- FROM: 'rockylinux:8.7'
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'
FROM:
- 'ubuntu:lunar'
- 'ubuntu:kinetic'
- 'ubuntu:jammy'
- 'ubuntu:focal'
- 'ubuntu:bionic'
- 'linuxmintd/mint21.1-amd64'
- 'linuxmintd/mint21-amd64'
- 'linuxmintd/mint20-amd64'
- 'debian:bookworm'
- 'debian:bullseye'
- 'debian:buster'
- 'opensuse/leap:15.5'
- 'opensuse/leap:15.4'
- 'opensuse/leap:15.3'
- 'opensuse/leap:15.2'
- 'fedora:38'
- 'fedora:37'
- 'fedora:36'
- 'fedora:35'
- 'fedora:34'
- 'rockylinux:9.1'
- 'rockylinux:9.0'
- 'rockylinux:8.7'
- 'rockylinux:8.6'
- 'rockylinux:8.5'
- 'manjarolinux/base'
- 'funtoo/stage3-generic_64'

steps:
- name: Checkout repository
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 #v3.5.0
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can check out the head.
Expand Down
59 changes: 30 additions & 29 deletions .github/workflows/gh-actions-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,38 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- FROM: 'ubuntu:kinetic'
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
- FROM: 'debian:bullseye'
- FROM: 'debian:buster'
- FROM: 'opensuse/leap'
- FROM: 'opensuse/leap:15.4'
- FROM: 'opensuse/leap:15.3'
- FROM: 'opensuse/leap:15.2'
- FROM: 'fedora:37'
- FROM: 'fedora:36'
- FROM: 'fedora:35'
- FROM: 'fedora:34'
- FROM: 'rockylinux/rockylinux'
- FROM: 'rockylinux:9.1'
- FROM: 'rockylinux:9.0'
- FROM: 'rockylinux:8.7'
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'
FROM:
- 'ubuntu:lunar'
- 'ubuntu:kinetic'
- 'ubuntu:jammy'
- 'ubuntu:focal'
- 'ubuntu:bionic'
- 'linuxmintd/mint21.1-amd64'
- 'linuxmintd/mint21-amd64'
- 'linuxmintd/mint20-amd64'
- 'debian:bookworm'
- 'debian:bullseye'
- 'debian:buster'
- 'opensuse/leap:15.5'
- 'opensuse/leap:15.4'
- 'opensuse/leap:15.3'
- 'opensuse/leap:15.2'
- 'fedora:38'
- 'fedora:37'
- 'fedora:36'
- 'fedora:35'
- 'fedora:34'
- 'rockylinux:9.1'
- 'rockylinux:9.0'
- 'rockylinux:8.7'
- 'rockylinux:8.6'
- 'rockylinux:8.5'
- 'manjarolinux/base'
- 'funtoo/stage3-generic_64'

steps:
- name: Checkout repository
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 #v3.5.0
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
with:
fetch-depth: 2
submodules: false
Expand All @@ -62,7 +63,7 @@ jobs:
echo "${TAG_NAME}"
- name: Docker Login
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a #v2.1.0
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc #v2.2.0
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_KEY }}
Expand Down
88 changes: 86 additions & 2 deletions script/bootstrap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
set -e

echo "------------------------------"
echo "--- bootstrap | 2023-05-14 ---"
echo "--- bootstrap | 2023-07-09 ---"
echo "------------------------------"

UPDATE_ALL_SYSTEM_PACKAGES="$1"
Expand Down Expand Up @@ -174,6 +174,38 @@ function bootstrapOnUbuntu()
fi

case "$LINUX_CODENAME" in
"lunar")
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 \
libopengl0 \
libpostproc-dev \
freeglut3-dev \
libboost-python-dev \
libboost-log-dev \
libboost-regex-dev \
libboost-program-options-dev \
libxmu-dev \
clang \
lsb-release
;;
"kinetic")
apt-get -qy install \
git \
Expand Down Expand Up @@ -601,6 +633,38 @@ function bootstrapOnOpenSuseLeap ()
rpm-build \
clang
;;
"15.5")
zypper --non-interactive install -y \
libboost_log1_75_0-devel \
libboost_python-py3-1_75_0-devel \
libboost_system1_75_0-devel \
libboost_filesystem1_75_0-devel \
libboost_thread1_75_0-devel \
libboost_regex1_75_0-devel \
libboost_chrono1_75_0-devel \
libboost_atomic1_75_0-devel \
libboost_program_options1_75_0-devel \
cmake \
gcc-c++ \
freeglut-devel \
libopenal0 \
openal-soft-devel \
libSDL-1_2-0 \
libSDL-devel \
libvorbis-devel \
libglvnd-devel \
libjpeg-turbo \
libjpeg62-devel \
libpng16-devel \
expat \
libexpat-devel \
libgtk-3-0 \
gtk3-devel \
python3-devel \
git \
rpm-build \
clang
;;
*)
echo "Sorry, this version of openSUSE Leap is unsupported"
exit 2
Expand Down Expand Up @@ -771,6 +835,26 @@ function bootstrapOnFedora ()
make \
clang
;;
38)
dnf install -y \
git \
cmake \
boost-devel \
freeglut-devel \
gcc-c++ \
openal-soft-devel \
sdl12-compat-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 Fedora is unsupported"
exit 2
Expand Down Expand Up @@ -1378,7 +1462,7 @@ function bootstrapOnManjaro ()
function bootstrapOnFuntoo ()
{
ego sync
emerge openal
emerge llvm clang openal libglvnd
}

case "${LINUX_ID}" in
Expand Down

0 comments on commit 4326cc7

Please sign in to comment.