fontconfig-devel

This commit is contained in:
2025-08-06 07:56:49 -05:00
parent 1dbd1e781f
commit 9a6a5eeaf8
3 changed files with 7 additions and 6 deletions

2
Jenkinsfile vendored
View File

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

View File

@@ -3,8 +3,8 @@
VALID_DOCKER_IMAGES=( VALID_DOCKER_IMAGES=(
'ubuntu-22.04' 'ubuntu-24.04' 'ubuntu-22.04' 'ubuntu-24.04'
'fedora-41' 'fedora-42' 'fedora-41' 'fedora-42'
'debian-12'
'archlinux-latest' 'archlinux-latest'
'debian-bookworm'
) )
check_docker() { check_docker() {
@@ -72,7 +72,7 @@ docker_build_image() {
echo 'RUN ln -sf /bin/bash /bin/sh' echo 'RUN ln -sf /bin/bash /bin/sh'
echo 'ENV DEBIAN_FRONTEND=noninteractive' echo 'ENV DEBIAN_FRONTEND=noninteractive'
echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}" echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}"
echo "RUN ${pkg_install} ${req_pkgs}" printf "RUN ${pkg_install} %s\n" "${req_pkgs[@]}"
echo 'RUN pipx install virtualenv' echo 'RUN pipx install virtualenv'
echo 'RUN pipx ensurepath' echo 'RUN pipx ensurepath'
echo 'RUN curl https://sh.rustup.rs -sSf | bash -s -- -y' echo 'RUN curl https://sh.rustup.rs -sSf | bash -s -- -y'
@@ -82,6 +82,7 @@ docker_build_image() {
} >"${dockerfile}" } >"${dockerfile}"
exit 0
echo_info "building ${image_tag}" echo_info "building ${image_tag}"
docker build \ docker build \
-t "${image_tag}" \ -t "${image_tag}" \

View File

@@ -12,7 +12,7 @@ determine_pkg_mgr() {
brew:brew update:brew upgrade:brew install:brew list --formula ${pkg} brew:brew update:brew upgrade:brew install:brew list --formula ${pkg}
apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg} apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg}
pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg} pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg}
dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg} dnf:{ ${SUDO}dnf check-update || true }:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg}
' '
local supported_pkg_mgr=() local supported_pkg_mgr=()
unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check
@@ -73,7 +73,7 @@ print_req_pkgs() {
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local dnf_pkgs=( local dnf_pkgs=(
"${common_linux_pkgs[@]}" openssl-devel "${common_linux_pkgs[@]}" openssl-devel
pipx ninja-build wget2 pipx ninja-build fontconfig-devel wget2
) )
local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs" local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
@@ -93,7 +93,7 @@ print_pkg_mgr() {
echo "export pkg_mgr_upgrade=\"${pkg_mgr_upgrade}\"" echo "export pkg_mgr_upgrade=\"${pkg_mgr_upgrade}\""
echo "export pkg_install=\"${pkg_install}\"" echo "export pkg_install=\"${pkg_install}\""
echo "export pkg_check=\"${pkg_check}\"" echo "export pkg_check=\"${pkg_check}\""
echo "export req_pkgs=\"$(print_req_pkgs)\"" echo "export req_pkgs=($(print_req_pkgs))"
} }
print_os() { print_os() {