From 75f0742b3b8f172eea3226cf33e3239605a71ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 10 Feb 2021 15:07:35 +0100 Subject: [PATCH] Drop arm/v7 images The rust build fails here. See #968 --- .github/bin/get-buildx-args | 4 ++-- .github/workflows/bleeding.yml | 8 +------- .github/workflows/dockerimage.yml | 8 +------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/bin/get-buildx-args b/.github/bin/get-buildx-args index 49c806889..325a47ac1 100755 --- a/.github/bin/get-buildx-args +++ b/.github/bin/get-buildx-args @@ -6,7 +6,7 @@ if [ -n "$MATRIX_ARCHITECTURE" ] ; then echo --cache-from "type=local,src=/tmp/.buildx-cache/$MATRIX_ARCHITECTURE" else - for arch in linux/amd64 linux/arm/v7 linux/arm64 ; do + for arch in linux/amd64 linux/arm64 ; do echo --cache-from "type=local,src=/tmp/.buildx-cache/$arch" done fi @@ -23,7 +23,7 @@ if [ "$1" = "load" ] ; then echo --tag weblate/weblate:test else # List of platforms - echo --platform "${MATRIX_ARCHITECTURE:-linux/amd64,linux/arm/v7,linux/arm64}" + echo --platform "${MATRIX_ARCHITECTURE:-linux/amd64,linux/arm64}" # Enable more platforms in future: # linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml index 1b8484cf4..e19a7dc97 100644 --- a/.github/workflows/bleeding.yml +++ b/.github/workflows/bleeding.yml @@ -39,7 +39,7 @@ jobs: name: Build, bleeding, ${{ matrix.architecture }} strategy: matrix: - architecture: [linux/arm/v7, linux/arm64] + architecture: [linux/arm64] env: MATRIX_ARCHITECTURE: ${{ matrix.architecture }} steps: @@ -250,12 +250,6 @@ jobs: with: path: /tmp/.buildx-cache/linux/arm64 key: ${{ runner.os }}-bleeding-${{ github.sha }}-linux/arm64 - - name: Cache Docker layers - uses: actions/cache@v2.1.4 - id: cache-arm-v7 - with: - path: /tmp/.buildx-cache/linux/arm/v7 - key: ${{ runner.os }}-bleeding-${{ github.sha }}-linux/arm/v7 - name: Cache Docker layers uses: actions/cache@v2.1.4 id: cache-amd64 diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9518de4b9..b1f0b1596 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -37,7 +37,7 @@ jobs: name: Build, stable, ${{ matrix.architecture }} strategy: matrix: - architecture: [linux/arm/v7, linux/arm64] + architecture: [linux/arm64] env: MATRIX_ARCHITECTURE: ${{ matrix.architecture }} steps: @@ -277,12 +277,6 @@ jobs: with: path: /tmp/.buildx-cache/linux/arm64 key: ${{ runner.os }}-buildx-${{ github.sha }}-linux/arm64 - - name: Cache Docker layers - uses: actions/cache@v2.1.4 - id: cache-arm-v7 - with: - path: /tmp/.buildx-cache/linux/arm/v7 - key: ${{ runner.os }}-buildx-${{ github.sha }}-linux/arm/v7 - name: Cache Docker layers uses: actions/cache@v2.1.4 id: cache-amd64