From 08b1c4a13c91ebb2ae5d5e14426603ee403cd623 Mon Sep 17 00:00:00 2001 From: Michael Thamm Date: Thu, 19 Dec 2024 16:01:48 -0500 Subject: [PATCH] revert branch to @main --- .github/workflows/_charm-linting.yaml | 2 +- .github/workflows/_charm-quality-checks.yaml | 10 +++++----- .github/workflows/_charm-static-analysis.yaml | 4 ++-- .github/workflows/_charm-tests-integration.yaml | 2 +- .github/workflows/_charm-tests-scenario.yaml | 2 +- .github/workflows/_charm-tests-unit.yaml | 2 +- .github/workflows/charm-pull-request.yaml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/_charm-linting.yaml b/.github/workflows/_charm-linting.yaml index 6e8c0355..4b4612b9 100644 --- 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 index 7228c49f..2835693e 100644 --- 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 index 7683fcaa..949c2773 100644 --- 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 index 68985f6b..cf5292ae 100644 --- 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 index b0983036..a281547f 100644 --- 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 index d3217483..856e5939 100644 --- 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 index b791e936..59862072 100644 --- 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 }}