Skip to content

Commit

Permalink
Try a workaround for armv6 and armv7
Browse files Browse the repository at this point in the history
  • Loading branch information
williamdes committed Feb 22, 2023
1 parent 40c800a commit f33bd2c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
platform: ["linux/amd64", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/s390x"]
platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64", "linux/s390x"]
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
7 changes: 6 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ ADD https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e
RUN mkdir /workdir/rp__doc__/ && tar --strip-components=1 -C /workdir/rp__doc__/ -xzf /tmp/rp__doc__.tar.gz

RUN tar --strip-components=1 -C /workdir -xzf /tmp/v$RUST_PYTHON_VERSION.tar.gz
RUN git apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
RUN git apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch

# armv6 and armv7 fix
# See: https://github.com/pyca/cryptography/issues/6673#issuecomment-985943023
# See: https://github.com/rust-lang/cargo/issues/6513
RUN mkdir -p ~/.cargo/registry/index && cd ~/.cargo/registry/index && git clone --bare https://github.com/rust-lang/crates.io-index.git github.com-1ecc6299db9ec823

# Remove the git mode that triggers an error on armv6 and armv7
# Ref: https://github.com/rust-lang/cargo/issues/2808 (failed to mmap. Could not write data: Out of memory; class=Os (2))
Expand Down

0 comments on commit f33bd2c

Please sign in to comment.