diff options
| author | Shyam Sunder <sgsunder1@gmail.com> | 2021-09-23 12:38:08 -0400 |
|---|---|---|
| committer | Shyam Sunder <sgsunder1@gmail.com> | 2021-09-23 12:49:32 -0400 |
| commit | d699979d359949789be27b7927b00cacefef1f21 (patch) | |
| tree | 981f371cd11d1708152e9093e0361df4749632cc | |
| parent | d08308440713063502979a40c04c641ddef7dde7 (diff) | |
client+server: cleanup GitHub actions workflow names
Also run unit test action on push
| -rw-r--r-- | .github/workflows/build-containers.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/run-unit-tests.yml | 24 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 11 |
3 files changed, 21 insertions, 18 deletions
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 518bf5b..3dda368 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -1,7 +1,8 @@ -name: build-containers +name: Build Docker containers on: [push] jobs: build-client: + name: Build and push client/ Docker container runs-on: ubuntu-latest steps: - name: Login to Docker Hub @@ -53,6 +54,7 @@ jobs: ./client build-server: + name: Build and push server/ Docker container runs-on: ubuntu-latest steps: - name: Login to Docker Hub diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 87ab4e8..9ea14ed 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -1,16 +1,28 @@ -name: run-unit-tests -on: [pull_request] +name: Run unit tests +on: [push, pull_request] jobs: test-server: + name: Run pytest for server/ runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Build test container - run: | - TAG=$(docker build --target testing -q ./server) - echo "image_tag=${TAG}" >> $GITHUB_ENV + run: > + docker buildx build --load + --platform linux/amd64 --target testing + -t test_container + ./server - name: Run unit tests - run: docker run --rm -t ${{ env.image_tag }} --color=no szurubooru/ + run: > + docker run --rm -t test_container + --color=no + --cov-report=term-missing:skip-covered + --cov=szurubooru + szurubooru/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5053b6e..c793e75 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -83,17 +83,6 @@ repos: files: server/szurubooru/ exclude: server/szurubooru/migrations/ pass_filenames: false - stages: [push] - - - id: pytest-cov - name: pytest - entry: bash -c 'docker run --rm -t $(docker build --target testing -q server/) --cov-report=term-missing:skip-covered --cov=szurubooru szurubooru/' - language: system - types: [python] - files: server/szurubooru/ - exclude: server/szurubooru/migrations/ - pass_filenames: false - verbose: true stages: [manual] fail_fast: true |