diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2022-10-14 14:11:27 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2022-10-14 14:11:27 -0400 |
| commit | bc2bd92b930288f3c4bb08a72d8dba24d7416ffd (patch) | |
| tree | fffa5bb099b5aa81e27a9b663a22bd57cc3300fe /.github | |
| parent | Accept threaded receipts for events related to the root event. (#14174) (diff) | |
| parent | 1.69.0rc4 (diff) | |
| download | synapse-bc2bd92b930288f3c4bb08a72d8dba24d7416ffd.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.69' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/docker.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b3793e5c1f..49427ab50d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,7 +27,7 @@ jobs: - name: Inspect builder run: docker buildx inspect - + - name: Log in to DockerHub uses: docker/login-action@v2 with: @@ -55,3 +55,8 @@ jobs: tags: "${{ steps.set-tag.outputs.tags }}" file: "docker/Dockerfile" platforms: linux/amd64,linux/arm64 + + # arm64 builds OOM without the git fetch setting. c.f. + # https://github.com/rust-lang/cargo/issues/10583 + build-args: | + CARGO_NET_GIT_FETCH_WITH_CLI=true |