diff options
| author | nicolargo <nicolas@nicolargo.com> | 2022-09-08 10:15:16 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2022-09-08 10:15:16 +0200 |
| commit | 55b063c6b0e934e8f9d80c34e2e32fa6f2d252fe (patch) | |
| tree | 886b7e7cb71d72f4528fa3a7d82e7b1566de5ca0 /.github | |
| parent | 52964dabec7bc6825eabe15ad031c14c38e62c08 (diff) | |
| parent | 5c607260358b91f0045aace03863e7b5d66bbd59 (diff) | |
Resolve merge conflicts
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f1252f6..a6e4b27e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,8 @@ env: DEFAULT_DOCKER_IMAGE: nicolargo/glances NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }} PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }} - DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386 + # linux/arm/v6 support following issue #2120 + DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64,linux/386 on: pull_request: |