From 637e2b62201f5384ac5be12c1f5ae5abc2b92a42 Mon Sep 17 00:00:00 2001
From: Adam Dyess <adam.dyess@canonical.com>
Date: Wed, 31 Jul 2024 13:49:11 -0500
Subject: [PATCH 1/2] Update github workflow to include a noble build on
 charmcraft-2.x

---
 .github/workflows/tests.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 11074de..14170be 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,9 +16,9 @@ jobs:
           - '3.12'  # noble
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Tox
@@ -31,12 +31,12 @@ jobs:
     needs: unit
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Add fake tag to make vergit happy
       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 }}
@@ -62,12 +62,12 @@ jobs:
         sudo iptables -F FORWARD
         sudo iptables -P FORWARD ACCEPT
     - name: Checkout layer-basic
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         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
@@ -107,6 +107,9 @@ jobs:
           - name: ubuntu
             channel: "22.04"
             architectures: [amd64]
+          - name: ubuntu
+            channel: "24.04"
+            architectures: [amd64]
         EOF
         charmcraft pack -p tests/charm-minimal -v
     - name: Build reactive charm with charmcraft-3.x
@@ -146,12 +149,12 @@ jobs:
     #   uses: lhotari/action-upterm@v1
     - name: Upload charmcraft execution logs
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: charmcraft execution logs
         path: ~/snap/charmcraft/common/cache/charmcraft/log/*.log
     - name: Upload built charms
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Built charms
         path: |

From 17033244f4207dd64d4ad10375073ad7fe9cad21 Mon Sep 17 00:00:00 2001
From: Adam Dyess <adam.dyess@canonical.com>
Date: Thu, 1 Aug 2024 09:52:36 -0500
Subject: [PATCH 2/2] uniqify the artifact names

---
 .github/workflows/tests.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 14170be..8bbe526 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -156,9 +156,5 @@ jobs:
     - name: Upload built charms
       uses: actions/upload-artifact@v4
       with:
-        name: Built charms
-        path: |
-          minimal_ubuntu-18.04-amd64.charm
-          minimal_ubuntu-20.04-amd64.charm
-          minimal_ubuntu-22.04-amd64.charm
-          minimal_ubuntu-24.04-amd64.charm
+        name: ${{matrix.charmcraft_channel}} built charms
+        path: minimal_ubuntu-*-amd64.charm