Merge pull request #82 from juju/3.5-into-3.6

chore: merge 3.5 into 3.6
juju · Nov 10, 2024 · 55add98 · 55add98
2 parents 5ac10db + ab25b1f
commit 55add98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
     needs: unit-tests
     uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v4
     with:
+      charmcraft-snap-channel: 2.x/stable
       artifact-name: charm-packed
 
 
@@ -93,7 +94,7 @@ jobs:
         env:
           CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
         run: |
-          sudo snap install charmcraft --classic
+          sudo snap install charmcraft --channel 2.x/stable --classic
           charmcraft upload ${{ steps.download.outputs.download-path }}/*.charm \
             --name $CHARM_NAME \
             --release ${{ needs.channel.outputs.test }}
@@ -143,7 +144,7 @@ jobs:
 
     - name: Install Juju
       run: |
-        sudo snap install juju --channel 3.3/beta
+        sudo snap install juju --channel 3.6/candidate
 
     - name: Bootstrap on LXD
       if: matrix.cloud == 'lxd'
@@ -179,7 +180,7 @@ jobs:
     steps:
     - name: Install Charmcraft
       run: |
-        sudo snap install charmcraft --classic
+        sudo snap install charmcraft --channel 2.x/stable --classic
 
     - name: Get uploaded revision
       id: revision

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -2,23 +2,32 @@ type: charm
 parts:
   charm:
     charm-python-packages: [setuptools,markdown]
+    build-packages:
+      - cargo
 bases:
     - build-on:
         - name: ubuntu
           channel: "22.04"
           architectures: ["amd64"]
       run-on:
+        - name: ubuntu
+          channel: "24.04"
+          architectures: 
+              - amd64
+              - arm64
+              - s390x
+              - ppc64el
         - name: ubuntu
           channel: "22.04"
           architectures: 
               - amd64
-              - aarch64
               - arm64
               - s390x
+              - ppc64el
         - name: ubuntu
           channel: "20.04"
           architectures: 
               - amd64
-              - aarch64
               - arm64
               - s390x
+              - ppc64el