Skip to content

Commit

Permalink
Add armv7h builds
Browse files Browse the repository at this point in the history
Combines:

fixup! Correct armv7 arch naming
fixup! lopsided/archlinux arch name for armv7h
fixup! Dockerfile tmpfs workaround arm32 on amd64

Adds a workaround mounting the .cargo directory as a tmpfs to avoid
https://gitlab.com/qemu-project/qemu/-/issues/263
  • Loading branch information
jclds139 committed Apr 12, 2022
1 parent 84f16c4 commit 3d97df8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
16 changes: 15 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
[
"linux/amd64 x86_64",
"linux/arm64/v8 aarch64",
"linux/arm/v7 armv7h"
]
name: Build ${{ matrix.arch }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -70,6 +71,9 @@ jobs:
- uses: actions/download-artifact@v2
with:
name: paru-aarch64
- uses: actions/download-artifact@v2
with:
name: paru-armv7h
- name: Create Release
id: create_release
uses: actions/create-release@master
Expand Down Expand Up @@ -99,4 +103,14 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./paru-aarch64.tar.zst
asset_name: paru-${{ steps.tags.outputs.tag }}-aarch64.tar.zst
asset_content_type: application/tar+zstd
asset_content_type: application/tar+zstd
- name: Upload armv7h asset
id: upload-release-asset-armv7h
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./paru-armv7h.tar.zst
asset_name: paru-${{ steps.tags.outputs.tag }}-armv7h.tar.zst
asset_content_type: application/tar+zstd
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ COPY ../ .
RUN pacman -Sy --noconfirm archlinux-keyring
RUN pacman -Su --noconfirm rustup
RUN rustup default stable
RUN ./scripts/dist
RUN --mount=type=tmpfs,target=/root/.cargo ./scripts/dist

0 comments on commit 3d97df8

Please sign in to comment.