Merge branch 'main' into dpe-3184-secrets-update

canonical · Jan 27, 2024 · 393511f · 393511f
2 parents e6250e3 + 05cc101
commit 393511f
Show file tree

Hide file tree

Showing 5 changed files with 307 additions and 299 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v9.0.2
+    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v11.0.0
 
   unit-test:
     name: Unit test charm
@@ -40,9 +40,9 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v9.0.2
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v11.0.0
     with:
-      charmcraft-snap-channel: beta
+      cache: true
 
   integration-test:
     strategy:
@@ -51,15 +51,15 @@ jobs:
         juju:
           - agent: 2.9.46
             libjuju: ^2
-          - agent: 3.1.6
+          - agent: 3.1.7
     name: Integration test charm | ${{ matrix.juju.agent }}
     needs:
       - lint
       - unit-test
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v9.0.2
+    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v11.0.0
     with:
-      artifact-name: ${{ needs.build.outputs.artifact-name }}
+      artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
       cloud: microk8s
       microk8s-snap-channel: 1.29-strict/stable
       juju-agent-version: ${{ matrix.juju.agent }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -50,19 +50,17 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v9.0.2
-    with:
-      charmcraft-snap-channel: beta
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v11.0.0
 
   release:
     name: Release charm
     needs:
       - ci-tests
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v9.0.2
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v11.0.0
     with:
       channel: 1/edge
-      artifact-name: ${{ needs.build.outputs.artifact-name }}
+      artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
     secrets:
       charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}
     permissions:

diff --git a/.github/workflows/sync_issue_to_jira.yaml b/.github/workflows/sync_issue_to_jira.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   sync:
     name: Sync GitHub issue to Jira
-    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v9.0.2
+    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v11.0.0
     with:
       jira-base-url: https://warthogs.atlassian.net
       jira-project-key: DPE