chore: test and publish the right charm

Signed-off-by: Guillaume Belanger <[email protected]>
canonical · Dec 3, 2024 · 93ff3f6 · 93ff3f6
1 parent 709eb44
commit 93ff3f6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ jobs:
   build-charm-under-test:
     strategy:
       matrix:
-        arch:
+        version:
           - arch: amd64
             base: ubuntu-22.04
             runner: ubuntu-22.04
@@ -20,7 +20,7 @@ jobs:
           - arch: arm64
             base: ubuntu-24.04
             runner: [self-hosted, linux, ARM64, medium, noble]
-    runs-on: ${{ matrix.arch.runner }}
+    runs-on: ${{ matrix.version.runner }}
     steps:
       - uses: actions/checkout@v4
 
@@ -36,8 +36,8 @@ jobs:
         run: |
           # Only copy the base specific charmcraft_<base>.yaml if it is not the
           # latest LTS (24.04). The latest LTS is used in the bare charmcraft.yaml
-          if [ "${{ matrix.arch.base }}" != "ubuntu-24.04" ]; then
-              cp charmcraft_${{ matrix.arch.base }}.yaml charmcraft.yaml
+          if [ "${{ matrix.version.base }}" != "ubuntu-24.04" ]; then
+              cp charmcraft_${{ matrix.version.base }}.yaml charmcraft.yaml
           fi
 
       - name: Build charm under test
@@ -46,6 +46,6 @@ jobs:
       - name: Archive Charm Under Test
         uses: actions/upload-artifact@v4
         with:
-          name: built-charm-${{ matrix.arch.arch }}
+          name: built-charm-${{ matrix.version.arch }}-${{ matrix.version.base }}
           path: "*.charm"
           retention-days: 5
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -7,24 +7,28 @@ jobs:
   integration-test:
     strategy:
       matrix:
-        arch:
+        version:
           - arch: amd64
-            runner: ubuntu-24.04
+            base: ubuntu-22.04
+            runner: ubuntu-22.04
           - arch: amd64
+            base: ubuntu-24.04
             runner: ubuntu-24.04
           - arch: arm64
+            base: ubuntu-22.04
             runner: [self-hosted, linux, ARM64, medium, jammy]
           - arch: arm64
+            base: ubuntu-24.04
             runner: [self-hosted, linux, ARM64, medium, noble]
-    runs-on: ${{ matrix.arch.runner }}
+    runs-on: ${{ matrix.version.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Fetch Charm Under Test
         uses: actions/download-artifact@v4
         with:
-          name: built-charm-${{ matrix.arch.arch }}
+          name: built-charm-${{ matrix.version.arch }}-${{ matrix.version.base }}
           path: built/
 
       - name: Get Charm Under Test Path

diff --git a/.github/workflows/publish-charm.yaml b/.github/workflows/publish-charm.yaml
@@ -10,12 +10,20 @@ jobs:
   publish-charm:
     strategy:
       matrix:
-        arch:
+        version:
           - arch: amd64
+            base: ubuntu-22.04
+            runner: ubuntu-22.04
+          - arch: amd64
+            base: ubuntu-24.04
             runner: ubuntu-24.04
           - arch: arm64
+            base: ubuntu-22.04
             runner: [self-hosted, linux, ARM64, medium, jammy]
-    runs-on: ${{ matrix.arch.runner }}
+          - arch: arm64
+            base: ubuntu-24.04
+            runner: [self-hosted, linux, ARM64, medium, noble]
+    runs-on: ${{ matrix.version.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -26,7 +34,7 @@ jobs:
       - name: Fetch Tested Charm
         uses: actions/download-artifact@v4
         with:
-          name: built-charm-${{ matrix.arch.arch }}
+          name: built-charm-${{ matrix.version.arch }}-${{ matrix.version.base }}
 
       - name: Get Charm Under Test Path
         id: charm-path