From 82212f849491b3ccd2d28adc2b1dca56999ef54f Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Sat, 16 Oct 2021 15:59:30 +0200 Subject: [PATCH] ci: add some vertical space for readability --- .github/workflows/integration-test.yaml | 6 ++++++ .github/workflows/unit-test.yaml | 5 +++++ .github/workflows/upgrade-test.yaml | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 75e2f63..7f62b4e 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -11,28 +11,34 @@ jobs: - uses: actions/setup-python@v2 with: python-version: 3.6 + - name: Set BOOTSTRAP_PIP_SPEC value run: | echo "BOOTSTRAP_PIP_SPEC=git+https://github.com/$GITHUB_REPOSITORY.git@$GITHUB_REF" >> $GITHUB_ENV + - name: Build systemd image run: | .github/integration-test.py build-image + - name: Run bootstrap checks run: | python3 -m pip install pytest pytest integration-tests/test_bootstrap.py -s + - name: Run basic tests run: | .github/integration-test.py run-test \ --bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \ basic-tests test_hub.py test_proxy.py \ test_install.py test_extensions.py + - name: Run admin tests run: | .github/integration-test.py run-test \ --installer-args "--admin admin:admin" \ --bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \ basic-tests test_admin_installer.py \ + - name: Run plugin tests run: | .github/integration-test.py run-test \ diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index ce047fd..cabd605 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -12,25 +12,30 @@ jobs: - uses: actions/setup-python@v2 with: python-version: 3.6 + - name: Install venv, git and setup venv run: | apt-get update --yes && apt-get install --yes python3-venv git python3 -m venv /srv/venv echo '/srv/venv/bin' >> $GITHUB_PATH + - name: Cache pip deps uses: actions/cache@v2 with: path: /srv/venv/ key: ${{ runner.os }}-pip-dependencies-${{ hashFiles('*setup.py', '*dev-requirements.txt') }} + - name: Install Python dependencies run: | python3 -m pip install -U pip==20.0.* python3 -m pip install -r dev-requirements.txt python3 -m pip install -e . pip freeze + - name: Run unit tests run: | pytest --cov=tljh tests/ + - name: Upload code coverage stats run: | codecov diff --git a/.github/workflows/upgrade-test.yaml b/.github/workflows/upgrade-test.yaml index 543a909..d251703 100644 --- a/.github/workflows/upgrade-test.yaml +++ b/.github/workflows/upgrade-test.yaml @@ -12,13 +12,16 @@ jobs: - uses: actions/setup-python@v2 with: python-version: 3.6 + - name: Set BOOTSTRAP_PIP_SPEC value run: | echo "BOOTSTRAP_PIP_SPEC=git+https://github.com/$GITHUB_REPOSITORY.git@$GITHUB_REF" >> $GITHUB_ENV echo $BOOTSTRAP_PIP_SPEC + - name: Build systemd image run: | .github/integration-test.py build-image + - name: Run basic tests run: | .github/integration-test.py run-test \ @@ -26,6 +29,7 @@ jobs: basic-tests test_hub.py test_proxy.py \ test_install.py test_extensions.py \ --upgrade + - name: Run admin tests run: | .github/integration-test.py run-test \ @@ -33,6 +37,7 @@ jobs: --bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \ basic-tests test_admin_installer.py \ --upgrade + - name: Run plugin tests run: | .github/integration-test.py run-test \