Skip to content

Commit

Permalink
Merge pull request ostreedev#3009 from cgwalters/c9s-ci
Browse files Browse the repository at this point in the history
C9s CI && composefs build detection fix
  • Loading branch information
cgwalters authored Aug 24, 2023
2 parents bcd4d02 + 33ef4ae commit db3b286
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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;
]])],
Expand Down

0 comments on commit db3b286

Please sign in to comment.