Merge branch 'main' into logging

canonical · Jul 19, 2024 · 26eeb72 · 26eeb72
2 parents 8a2b693 + c9bb193
commit 26eeb72
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/comment_contributing.yaml b/.github/workflows/comment_contributing.yaml
@@ -0,0 +1,13 @@
+name: Comment on the pull request
+
+on:
+  pull_request:
+    types:
+      - opened
+    branches:
+      - 'track/**'
+
+jobs:
+  comment-on-pr:
+    uses: canonical/operator-workflows/.github/workflows/comment_contributing.yaml@main
+    secrets: inherit
diff --git a/.github/workflows/publish_charm.yaml b/.github/workflows/publish_charm.yaml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - main
+      - track/*
 
 jobs:
-  test-and-publish-charm:
+  publish-to-edge:
     uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@main
     secrets: inherit
-    with:
-      channel: latest/edge
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-cosl==0.0.12
+cosl==0.0.13
 jenkinsapi==0.3.13
-jsonschema==4.22.0
+jsonschema==4.23.0
 ops==2.14.1
 pydantic==1.10.17
 requests==2.32.3