Skip to content

Commit

Permalink
Remove old files
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelallan72 committed Sep 18, 2024
1 parent 6f42f3c commit c056536
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 138 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ jobs:
fail-fast: false
matrix:
runs-on: [[ubuntu-22.04]]
test-command: ['FUNC_ARGS="--series focal" make functional', 'FUNC_ARGS="--series jammy" make functional']
test-command: ['tox -e func -- --series focal -v', 'tox -e func -- --series jammy -v']
juju-channel: ["3.4/stable"]
steps:

- uses: actions/checkout@v4
with:
submodules: true

# arm64 runners don't have make or gcc installed by default
# arm64 runners don't have gcc installed by default
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y make gcc
sudo apt install -y gcc
- name: Setup Python
uses: actions/setup-python@v5
Expand All @@ -71,8 +71,16 @@ jobs:
echo "TEST_MODEL_CONSTRAINTS=arch=arm64" >> "$GITHUB_ENV"
fi
- name: Build the charm
run: charmcraft -v pack

- name: Run tests
run: ${{ matrix.test-command }}
run: |
export CHARM_PATH_JAMMY="$(pwd)/$(ls | grep '.*22.04.*\.charm$')"
echo "$CHARM_PATH_JAMMY"
export CHARM_PATH_FOCAL="$(pwd)/$(ls | grep '.*20.04.*\.charm$')"
echo "$CHARM_PATH_FOCAL"
${{ matrix.test-command }}
env:
TEST_JUJU3: "1" # https://github.com/openstack-charmers/zaza/pull/653
TEST_JUJU_CHANNEL: ${{ matrix.juju-channel }}
Expand Down
23 changes: 0 additions & 23 deletions .pre-commit-config.yaml

This file was deleted.

81 changes: 0 additions & 81 deletions Makefile

This file was deleted.

17 changes: 0 additions & 17 deletions rename.sh

This file was deleted.

13 changes: 0 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,6 @@ passenv =
SNAP_HTTPS_PROXY
OS_*

[testenv:dev-environment]
envdir = {toxinidir}/.venv
deps =
pre-commit
{[testenv:lint]deps}
{[testenv:unit]deps}
{[testenv:func]deps}

[testenv:pre-commit]
envdir = {[testenv:dev-environment]envdir}
deps = {[testenv:dev-environment]deps} # ensure that dev-environment is installed
commands = pre-commit run --all-files

[testenv:lint]
commands =
pflake8
Expand Down

0 comments on commit c056536

Please sign in to comment.