Merge pull request #3009 from cgwalters/c9s-ci

C9s CI && composefs build detection fix
This commit is contained in:
Colin Walters 2023-08-24 19:38:22 -04:00 committed by GitHub
commit db3b286d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -80,6 +80,30 @@ jobs:
with:
name: inst.tar.zst
path: inst.tar.zst
build-c9s:
name: "Build (C9S)"
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream9
steps:
- name: Install bootstrap dependencies
run: dnf -y install git-core dnf-utils zstd
- name: Checkout repository
uses: actions/checkout@v3
# https://github.com/actions/checkout/issues/760
- name: Mark git checkout as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Install build dependencies
run: dnf config-manager --enable crb && dnf builddep -y ostree
- name: Build
run: |
env NOCONFIGURE=1 ./autogen.sh &&
./configure --with-curl --with-selinux --with-dracut=yesbutnoconf &&
make -j 4 && make install DESTDIR=$(pwd)/install && tar -c -C install --zstd -f inst.tar.zst .
- name: Upload binary
uses: actions/upload-artifact@v2
with:
name: inst-c9s.tar.zst
path: inst.tar.zst
privtest:
name: "Privileged testing"
needs: [build-c, build-integration]

View File

@ -278,6 +278,7 @@ dnl composefs won't work at all without this
AC_MSG_CHECKING([for MOUNT_ATTR_IDMAP])
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[
#include <linux/mount.h>
#include <sys/mount.h>
int foo = MOUNT_ATTR_IDMAP;
]])],