This commit is contained in:
2025-07-29 19:20:34 -05:00
parent ee8b27ff56
commit 7f23cb6824
3 changed files with 11 additions and 8 deletions

3
Jenkinsfile vendored
View File

@@ -7,7 +7,8 @@ pipeline {
axes { axes {
axis { axis {
name 'DISTRO' name 'DISTRO'
values 'debian:bookworm', 'ubuntu:24.04', 'archlinuxarm:latest', 'fedora:42' values 'debian:bookworm', 'ubuntu:24.04', 'ubuntu:22.04',
'ogarcia/archlinux:latest', 'fedora:42'
} }
} }
stages { stages {

View File

@@ -3,9 +3,11 @@
validate_selected_image() { validate_selected_image() {
local selectedImage="${1:-}" local selectedImage="${1:-}"
local validImages=( local validImages=(
'debian:bookworm' 'ubuntu:24.04' 'ubuntu:22.04' 'ubuntu:24.04'
'archlinux:latest' 'archlinuxarm:latest' 'fedora:41' 'fedora:42'
'fedora:42' 'archlinux:latest'
'ogarcia/archlinux:latest'
'debian:bookworm'
) )
for distro in "${validImages[@]}"; do for distro in "${validImages[@]}"; do
if [[ ${selectedImage} == "${distro}" ]]; then if [[ ${selectedImage} == "${distro}" ]]; then

View File

@@ -42,13 +42,13 @@ dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf i
print_req_pkgs() { print_req_pkgs() {
local common_pkgs=( local common_pkgs=(
autoconf automake cmake libtool autoconf automake cmake libtool
texinfo nasm yasm python3 texinfo nasm yasm python3 wget
meson doxygen jq ccache gawk meson doxygen jq ccache gawk
) )
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local brew_pkgs=( local brew_pkgs=(
"${common_pkgs[@]}" pkgconf "${common_pkgs[@]}" pkgconf
mkvtoolnix pipx wget mkvtoolnix pipx
) )
local common_linux_pkgs=( local common_linux_pkgs=(
"${common_pkgs[@]}" clang valgrind "${common_pkgs[@]}" clang valgrind
@@ -62,13 +62,13 @@ print_req_pkgs() {
libvorbis-dev libxcb1-dev pipx libvorbis-dev libxcb1-dev pipx
libxcb-shm0-dev libxcb-xfixes0-dev libxcb-shm0-dev libxcb-xfixes0-dev
zlib1g-dev libssl-dev ninja-build zlib1g-dev libssl-dev ninja-build
gobjc++ mawk libnuma-dev wget gobjc++ mawk libnuma-dev
mediainfo mkvtoolnix libgtest-dev mediainfo mkvtoolnix libgtest-dev
) )
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local pacman_pkgs=( local pacman_pkgs=(
"${common_linux_pkgs[@]}" base-devel "${common_linux_pkgs[@]}" base-devel
python-pipx ninja wget python-pipx ninja
) )
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local dnf_pkgs=( local dnf_pkgs=(