Fix publish frontend workflow (#248)

* Upgrade upload-charm action * Trigger publish frontend on push of development branch * Temporarily avoid building image * Fix frontend charm linting issues * Remove unused dependency * Use tag-prefix to separate frontend and api tags * Remove publish frontend workflow changes for testing * Upgrade upload charm action for api too
canonical · Jan 21, 2025 · 09d5409 · 09d5409
1 parent a4770f3
commit 09d5409
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/publish_api.yml b/.github/workflows/publish_api.yml
@@ -61,8 +61,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Upload charm to charmhub
-        uses: canonical/charming-actions/upload-charm@2.4.0
+        uses: canonical/charming-actions/upload-charm@2.6.3
         with:
           charm-path: "backend/charm"
           credentials: "${{ secrets.CHARMHUB_TOKEN }}"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+          tag-prefix: "api"
diff --git a/.github/workflows/publish_frontend.yml b/.github/workflows/publish_frontend.yml
@@ -58,8 +58,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Upload charm to charmhub
-        uses: canonical/charming-actions/upload-charm@2.4.0
+        uses: canonical/charming-actions/upload-charm@2.6.3
         with:
           charm-path: "frontend/charm"
           credentials: "${{ secrets.CHARMHUB_TOKEN }}"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+          tag-prefix: "frontend"
diff --git a/frontend/charm/requirements.txt b/frontend/charm/requirements.txt
@@ -1,2 +1 @@
-ops >= 2.8.0
-macaroonbakery==1.3.2 # workaround to failures such as https://github.com/canonical/test_observer/actions/runs/7142353669/job/19451476954
+ops >= 2.8.0
diff --git a/frontend/charm/tests/unit/test_charm.py b/frontend/charm/tests/unit/test_charm.py
@@ -17,6 +17,7 @@
 
 import ops
 import ops.testing
+
 from charm import TestObserverFrontendCharm
 
 

diff --git a/frontend/charm/tox.ini b/frontend/charm/tox.ini
@@ -30,7 +30,7 @@ deps =
     ruff
 commands =
     black {[vars]all_path}
-    ruff --fix {[vars]all_path}
+    ruff check {[vars]all_path}
 
 [testenv:lint]
 description = Check code against coding style standards
@@ -43,7 +43,7 @@ commands =
     # and uncomment the following line
     # codespell {[vars]lib_path}
     codespell {tox_root}
-    ruff {[vars]all_path}
+    ruff check {[vars]all_path}
     black --check --diff {[vars]all_path}
 
 [testenv:unit]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@

		import ops
		import ops.testing

		from charm import TestObserverFrontendCharm


Expand Down