Skip to content

Commit

Permalink
ci: Ensure composefs+openssl are is enabled on Fedora
Browse files Browse the repository at this point in the history
For some reason we're not picking this up in the Prow build,
which breaks things because now rpm-ostree hard requires it.

Let's make this a fatal build time error for more clear
debugging.
  • Loading branch information
cgwalters committed Oct 6, 2023
1 parent befd844 commit f331bad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ if test "${OS_ID}" = 'fedora'; then
*) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
esac
fi
if [[ "${OS_ID_LIKE}" =~ rhel|fedora ]]; then
CONFIGOPTS="${CONFIGOPTS:-} --with-composefs --with-openssl"
fi
case "${CONFIGOPTS:-}" in
*--with-curl*|--with-soup*)
if test -x /usr/bin/gnome-desktop-testing-runner; then
Expand Down
1 change: 1 addition & 0 deletions ci/libbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
dn=$(cd $(dirname $0) && pwd)

OS_ID=$(. /etc/os-release; echo $ID)
OS_ID_LIKE=$(. /etc/os-release; echo $OS_ID $ID_LIKE)
OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)

pkg_upgrade() {
Expand Down

0 comments on commit f331bad

Please sign in to comment.