fixup! ci: Remove destructive mode

canonical · Oct 18, 2023 · 089ace7 · 089ace7
1 parent 2ad2126
commit 089ace7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -101,7 +101,7 @@ jobs:
           # https://github.com/canonical/charmcraft/issues/1132
           # and https://github.com/canonical/charmcraft/issues/1138
           # and avoid usage of destructive-mode
-          charmcraft-channel: latest/edge # Use latest/edge
+          charmcraft-channel: latest/edge
 
       - run: |
           sg snap_microk8s -c "tox -e ${{ matrix.charm }}-integration"
@@ -139,7 +139,11 @@ jobs:
           provider: microk8s
           channel: 1.25-strict/stable
           juju-channel: 3.1/stable
-          charmcraft-channel: latest/candidate
+          # Use latest/edge for charmcraft in order to include fixes for
+          # https://github.com/canonical/charmcraft/issues/1132
+          # and https://github.com/canonical/charmcraft/issues/1138
+          # and avoid usage of destructive-mode
+          charmcraft-channel: latest/edge
           microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49"
 
       - name: Run test