From 126f0fbf87bc9ae3da8a04e54fe16717a484b48d Mon Sep 17 00:00:00 2001 From: Marcelo Alencar Date: Mon, 7 Aug 2023 10:48:33 -0300 Subject: [PATCH] Re-enable ARMv6 builds (for Raspberry and other portable devices) (#1724) --- .github/workflows/containers.yml | 2 +- .github/workflows/test-container-build.yml | 2 +- requirements.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 1c1973a4..ce3627bc 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -95,7 +95,7 @@ jobs: push: true tags: | ${{ secrets.DOCKER_HUB_USERNAME }}/changedetection.io:dev,ghcr.io/${{ github.repository }}:dev - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache # Looks like this was disabled diff --git a/.github/workflows/test-container-build.yml b/.github/workflows/test-container-build.yml index 86b097e4..c46b2cf0 100644 --- a/.github/workflows/test-container-build.yml +++ b/.github/workflows/test-container-build.yml @@ -62,7 +62,7 @@ jobs: with: context: ./ file: ./Dockerfile - platforms: linux/arm/v7,linux/amd64,linux/arm64, + platforms: linux/arm/v6,linux/arm/v7,linux/amd64,linux/arm64, cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/requirements.txt b/requirements.txt index e4544f59..9c09aca3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -71,3 +71,6 @@ pillow # Include pytest, so if theres a support issue we can ask them to run these tests on their setup pytest ~=7.2 pytest-flask ~=1.2 + +# Pin jsonschema version to prevent build errors on armv6 while rpds-py wheels aren't available (1708) +jsonschema==4.17.3