Skip to content

Commit

Permalink
snap: Add rust to build-packages (#682)
Browse files Browse the repository at this point in the history
* snap: Add rust to build-packages

When building the snap on s390x some Python modules need to compile
their extensions (rust based), this is not needed on amd64 since pypi
has compiled packages available.

This change add rustc, cargo and pkg-config to the list of
build-packages in the snapcraft.yaml definition.

* Migrate gh action actions/upload-artifact@v4

* Migration gh action actions/download-artifact@v4
  • Loading branch information
freyes authored Nov 13, 2024
1 parent 0c02af3 commit b8747e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: git tag v0.0.0
- uses: snapcore/action-build@v1
id: snap-build
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v4
with:
name: charm-snap
path: ${{ steps.snap-build.outputs.snap }}
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
repository: juju-solutions/layer-basic

- name: Download built charm snap
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: charm-snap
path: tests/charm-minimal/charm-snap
Expand Down
3 changes: 3 additions & 0 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ parts:
- libffi-dev
- libpython3.10-dev
- python3-pip
- rustc
- cargo
- pkg-config
# Note that we cannot use any -dev type packages here, as that would pull
# in the libc6 package. The libc6 package contains absolute symlinks
# pointing at /, which is not allowed in a core22 classic snap.
Expand Down

0 comments on commit b8747e0

Please sign in to comment.