revert branch to @main

canonical · Dec 19, 2024 · 08b1c4a · 08b1c4a
1 parent 16e80d5
commit 08b1c4a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/_charm-linting.yaml b/.github/workflows/_charm-linting.yaml
@@ -25,7 +25,7 @@ jobs:
           python3 -m pip install tox
           sudo snap install --classic astral-uv
       - name: Run tests
-        uses: canonical/observability/.github/actions/charm-run-task@feature/conditional-ci
+        uses: canonical/observability/.github/actions/charm-run-task@main
         with:
           charm-path: ${{ inputs.charm-path }}
           test-type: lint
diff --git a/.github/workflows/_charm-quality-checks.yaml b/.github/workflows/_charm-quality-checks.yaml
@@ -64,22 +64,22 @@ jobs:
           charmcraft-channel: "${{ inputs.charmcraft-channel }}"
   static-analysis:
     name: Static Analysis
-    uses: canonical/observability/.github/workflows/_charm-static-analysis.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-static-analysis.yaml@main
     with:
       charm-path: "${{ inputs.charm-path }}"
   linting:
     name: Linting
-    uses: canonical/observability/.github/workflows/_charm-linting.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-linting.yaml@main
     with:
       charm-path: "${{ inputs.charm-path }}"
   unit-test:
     name: Unit Tests
-    uses: canonical/observability/.github/workflows/_charm-tests-unit.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-tests-unit.yaml@main
     with:
       charm-path: "${{ inputs.charm-path }}"
   scenario-test:
     name: Scenario Tests
-    uses: canonical/observability/.github/workflows/_charm-tests-scenario.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-tests-scenario.yaml@main
     with:
       charm-path: "${{ inputs.charm-path }}"
   integration-test:
@@ -89,7 +89,7 @@ jobs:
       - linting
       - unit-test
       - scenario-test
-    uses: canonical/observability/.github/workflows/_charm-tests-integration.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-tests-integration.yaml@main
     with:
       charm-path: "${{ inputs.charm-path }}"
       provider: "${{ inputs.provider }}"

diff --git a/.github/workflows/_charm-static-analysis.yaml b/.github/workflows/_charm-static-analysis.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   static:
-    name: Static static analysis for /lib and charm
+    name: Static analysis (lib and charm)
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -25,7 +25,7 @@ jobs:
           python3 -m pip install tox
           sudo snap install --classic astral-uv
       - name: Run tests
-        uses: canonical/observability/.github/actions/charm-run-task@feature/conditional-ci
+        uses: canonical/observability/.github/actions/charm-run-task@main
         with:
           charm-path: ${{ inputs.charm-path }}
           test-type: static
diff --git a/.github/workflows/_charm-tests-integration.yaml b/.github/workflows/_charm-tests-integration.yaml
@@ -69,7 +69,7 @@ jobs:
         run: |
           sudo snap install --classic astral-uv
       - name: Run tests
-        uses: canonical/observability/.github/actions/charm-run-task@feature/conditional-ci
+        uses: canonical/observability/.github/actions/charm-run-task@main
         with:
           charm-path: ${{ inputs.charm-path }}
           test-type: integration

diff --git a/.github/workflows/_charm-tests-scenario.yaml b/.github/workflows/_charm-tests-scenario.yaml
@@ -25,7 +25,7 @@ jobs:
           python -m pip install tox
           sudo snap install --classic astral-uv
       - name: Run tests
-        uses: canonical/observability/.github/actions/charm-run-task@feature/conditional-ci
+        uses: canonical/observability/.github/actions/charm-run-task@main
         with:
           charm-path: ${{ inputs.charm-path }}
           test-type: scenario
diff --git a/.github/workflows/_charm-tests-unit.yaml b/.github/workflows/_charm-tests-unit.yaml
@@ -25,7 +25,7 @@ jobs:
           python -m pip install tox
           sudo snap install --classic astral-uv
       - name: Run tests
-        uses: canonical/observability/.github/actions/charm-run-task@feature/conditional-ci
+        uses: canonical/observability/.github/actions/charm-run-task@main
         with:
           charm-path: ${{ inputs.charm-path }}
           test-type: unit
diff --git a/.github/workflows/charm-pull-request.yaml b/.github/workflows/charm-pull-request.yaml
@@ -68,7 +68,7 @@ jobs:
     needs:
       - ci-ignore
     if: needs.ci-ignore.outputs.any_modified == 'true'
-    uses: canonical/observability/.github/workflows/_charm-quality-checks.yaml@feature/conditional-ci
+    uses: canonical/observability/.github/workflows/_charm-quality-checks.yaml@main
     secrets: inherit
     with:
       charm-path: ${{ inputs.charm-path }}