Skip to content

Commit

Permalink
Merge branch 'ci_fix_multistage' into 10.2.beta5+updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoeppe committed Oct 2, 2023
2 parents 2c93d14 + def59ae commit 026651d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions build/pkgs/_bootstrap/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Packages needed for ./bootstrap
autoconf automake libtool
# Otherwise: Error: could not locate the pkg-config autoconf macros. These are
pkg-config
pkgconf
1 change: 1 addition & 0 deletions build/pkgs/pkgconf/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pkgconf
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,10 @@ setenv =
ubuntu-focal: BASE_TAG=focal
ubuntu-jammy: BASE_TAG=jammy
ubuntu-lunar: BASE_TAG=lunar
ubuntu-lunar: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-mantic: BASE_TAG=mantic
ubuntu-mantic: IGNORE_MISSING_SYSTEM_PACKAGES=yes
#
# https://hub.docker.com/_/debian
# debian-buster does not have libfreetype-dev (it only has libfreetype6-dev)
# debian-bullseye does not have libgiac-dev
# debian-trixie does not have libbrial-dev
#
Expand All @@ -238,6 +237,7 @@ setenv =
debian-stretch: BASE_TAG=stretch
debian-stretch: IGNORE_MISSING_SYSTEM_PACKAGES=yes
debian-buster: BASE_TAG=buster
debian-buster: IGNORE_MISSING_SYSTEM_PACKAGES=yes
debian-bullseye: BASE_TAG=bullseye
debian-bullseye: IGNORE_MISSING_SYSTEM_PACKAGES=yes
debian-bookworm: BASE_TAG=bookworm
Expand Down

0 comments on commit 026651d

Please sign in to comment.