Skip to content

Commit

Permalink
Merge pull request #1077 from trws/binfmt-flags
Browse files Browse the repository at this point in the history
Change binfmt flags to ensure setuid is enabled in qemu-user-static supported CI runs
  • Loading branch information
mergify[bot] authored Sep 18, 2023
2 parents f1e77a5 + b40f2ba commit 6948322
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .configure-custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ DISABLE_VARS="docs|Off|ENABLE_DOCS"
ENABLE_ENABLE_COVERAGE_DOC="enable coverage analysis"
ENABLE_ENABLE_DOCS_DOC="enable building manpages"
ENABLE_DISABLE_DOCS_DOC="disable building manpages"
WITH_VARS="systemdsystemunitdir|/etc/systemd/system|FLUX_SYSTEMD_SYSTEM_UNIT_DIR"
WITH_FLUX_SYSTEMD_SYSTEM_UNIT_DIR_DOC="systemd system directory"
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ jobs:
uses: docker/setup-buildx-action@v2
if: matrix.needs_buildx

- uses: dbhi/qus/action@main
with:
targets: aarch64
- name: setup qemu-user-static
run: |
docker run --rm --privileged aptman/qus -s -- -p --credential aarch64
- name: docker-run-checks
env: ${{matrix.env}}
Expand Down
6 changes: 6 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ sphinx:
python:
install:
- requirements: doc/requirements.txt
build:
os: ubuntu-22.04
tools:
python: "3.10"


4 changes: 1 addition & 3 deletions src/test/docker/docker-run-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,7 @@ if [[ "$INSTALL_ONLY" == "t" ]]; then
sh -c "./autogen.sh &&
./configure --prefix=/usr --sysconfdir=/etc \
--with-systemdsystemunitdir=/etc/systemd/system \
--localstatedir=/var \
--with-flux-security \
--enable-caliper &&
--localstatedir=/var &&
make clean &&
make -j${JOBS}"
RC=$?
Expand Down

0 comments on commit 6948322

Please sign in to comment.