From 7f23cb6824b667b8bb3edc55674e008f97be9fc9 Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Tue, 29 Jul 2025 19:20:34 -0500 Subject: [PATCH] ok --- Jenkinsfile | 3 ++- lib/docker.sh | 8 +++++--- lib/install_deps.sh | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df90beb..f4835ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,8 @@ pipeline { axes { axis { 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 { diff --git a/lib/docker.sh b/lib/docker.sh index 3e7cdfd..115e04c 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -3,9 +3,11 @@ validate_selected_image() { local selectedImage="${1:-}" local validImages=( - 'debian:bookworm' 'ubuntu:24.04' - 'archlinux:latest' 'archlinuxarm:latest' - 'fedora:42' + 'ubuntu:22.04' 'ubuntu:24.04' + 'fedora:41' 'fedora:42' + 'archlinux:latest' + 'ogarcia/archlinux:latest' + 'debian:bookworm' ) for distro in "${validImages[@]}"; do if [[ ${selectedImage} == "${distro}" ]]; then diff --git a/lib/install_deps.sh b/lib/install_deps.sh index 2e3d02e..4052a78 100644 --- a/lib/install_deps.sh +++ b/lib/install_deps.sh @@ -42,13 +42,13 @@ dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf i print_req_pkgs() { local common_pkgs=( autoconf automake cmake libtool - texinfo nasm yasm python3 + texinfo nasm yasm python3 wget meson doxygen jq ccache gawk ) # shellcheck disable=SC2034 local brew_pkgs=( "${common_pkgs[@]}" pkgconf - mkvtoolnix pipx wget + mkvtoolnix pipx ) local common_linux_pkgs=( "${common_pkgs[@]}" clang valgrind @@ -62,13 +62,13 @@ print_req_pkgs() { libvorbis-dev libxcb1-dev pipx libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev ninja-build - gobjc++ mawk libnuma-dev wget + gobjc++ mawk libnuma-dev mediainfo mkvtoolnix libgtest-dev ) # shellcheck disable=SC2034 local pacman_pkgs=( "${common_linux_pkgs[@]}" base-devel - python-pipx ninja wget + python-pipx ninja ) # shellcheck disable=SC2034 local dnf_pkgs=(