From 6292fd12948fc6273b23528bd7427f366d4249c6 Mon Sep 17 00:00:00 2001 From: static-void-main <33235498+static-void-main@users.noreply.github.com> Date: Tue, 30 Mar 2021 20:10:36 +0200 Subject: [PATCH] Add i386 arch Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com> --- .github/workflows/test-and-build.yaml | 2 +- build.yml | 9 +++++++++ test/conftest.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index ebe1acb..363752b 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ARCH: [amd64, armhf, arm64] + ARCH: [amd64, armhf, arm64, i386] DEBIAN_VERSION: [stretch, buster, bullseye] env: ARCH: ${{matrix.ARCH}} diff --git a/build.yml b/build.yml index ae896d6..68b657f 100644 --- a/build.yml +++ b/build.yml @@ -47,3 +47,12 @@ services: PIHOLE_BASE: multiarch/debian-debootstrap:arm64-${DEBIAN_VERSION:-buster}-slim PIHOLE_ARCH: arm64 S6_ARCH: aarch64 + i386: + image: pihole:${PIHOLE_VERSION}-i386-${DEBIAN_VERSION:-buster} + build: + context: . + args: + <<: *common-args + PIHOLE_BASE: multiarch/debian-debootstrap:i386-${DEBIAN_VERSION:-buster}-slim + PIHOLE_ARCH: i386 + S6_ARCH: x86 diff --git a/test/conftest.py b/test/conftest.py index 127f957..83253b0 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -91,7 +91,7 @@ def DockerPersist(request, persist_test_args, persist_args, persist_image, persi def entrypoint(): return '' -@pytest.fixture(params=['amd64', 'armhf', 'arm64', 'armel']) +@pytest.fixture(params=['amd64', 'armhf', 'arm64', 'armel', 'i386']) def arch(request): return request.param