Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Conditional uv vs. tox tests for quality-checks.yaml" #251

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/_charm-linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
with:
python-version: 3.8
- name: Install dependencies
run: |
python3 -m pip install tox
sudo snap install --classic astral-uv
run: python3 -m pip install tox
- name: Run linters
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -vve lint || make lint
run: cd ${{ inputs.charm-path }} && tox -vve lint
16 changes: 4 additions & 12 deletions .github/workflows/_charm-static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ jobs:
with:
python-version: 3.8
- name: Install dependencies
run: |
python3 -m pip install tox
sudo snap install --classic astral-uv
run: python3 -m pip install tox
- name: Run static analysis for /lib for 3.8
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -vve static-lib || make static
run: cd ${{ inputs.charm-path }} && tox -vve static-lib
static-charm:
name: Static Analysis of Charm
runs-on: ubuntu-latest
Expand All @@ -41,10 +37,6 @@ jobs:
with:
python-version: 3.8
- name: Install dependencies
run: |
python3 -m pip install tox
sudo snap install --classic astral-uv
run: python3 -m pip install tox
- name: Run static analysis (charm)
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -vve static-charm || make static
run: cd ${{ inputs.charm-path }} && tox -vve static-charm
7 changes: 1 addition & 6 deletions .github/workflows/_charm-tests-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,8 @@ jobs:
microk8s-group: snap_microk8s
microk8s-addons: "hostpath-storage dns metallb:${{ inputs.ip-range || steps.ip_range.outputs.ip_range }}"
charmcraft-channel: "${{ inputs.charmcraft-channel }}"
- name: Install dependencies
run: |
sudo snap install --classic astral-uv
- name: Run integration tests
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -vve integration || make integration
run: cd ${{ inputs.charm-path }} && tox -vve integration
- name: Dump logs
if: failure()
uses: canonical/charming-actions/dump-logs@main
8 changes: 2 additions & 6 deletions .github/workflows/_charm-tests-scenario.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install tox
sudo snap install --classic astral-uv
run: python -m pip install tox
- name: Run tests
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -e scenario || make scenario || echo "Skipping scenario..."
run: cd ${{ inputs.charm-path }} && tox -e scenario
8 changes: 2 additions & 6 deletions .github/workflows/_charm-tests-unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install tox
sudo snap install --classic astral-uv
run: python -m pip install tox
- name: Run tests
run: |
cd ${{ inputs.charm-path }}
[ -f tox.ini ] && tox -e unit || make unit
run: cd ${{ inputs.charm-path }} && tox -e unit
Loading