From e1e9b80e4bed6f8a03d078ffe286adb367d170d9 Mon Sep 17 00:00:00 2001 From: Masum Billal Date: Sun, 16 Jun 2024 11:29:22 +0600 Subject: [PATCH 1/5] minor fixes --- .github/workflows/ci.yml | 2 +- .trunk/trunk.yaml | 4 +++- README.md | 3 +-- codecov.yml | 3 +-- pyproject.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 942013f..8b308a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Tox and Trunk +name: Code check on: push: diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 218b019..e463d87 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -35,8 +35,10 @@ lint: - Dockerfile - .github/workflows/*.yml actions: + disabled: + - trunk-fmt-pre-commit enabled: - trunk-upgrade-available - trunk-announce - trunk-check-pre-push - - trunk-fmt-pre-commit + diff --git a/README.md b/README.md index 80890e7..0799971 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Bug Tracker -[![Tox and Trunk](https://github.com/proafxin/bug-tracker/actions/workflows/python-package.yml/badge.svg?branch=develop)](https://github.com/proafxin/bug-tracker/actions/workflows/python-package.yml) - +[![Code check](https://github.com/proafxin/bug-tracker/actions/workflows/ci.yml/badge.svg)](https://github.com/proafxin/bug-tracker/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/proafxin/bug-tracker/graph/badge.svg?token=WAJ9M1BUL1)](https://codecov.io/gh/proafxin/bug-tracker) A set of asynchronous APIs to keep track of bugs under stories. diff --git a/codecov.yml b/codecov.yml index 76b4e3e..eccb09a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,8 +1,7 @@ coverage: precision: 2 round: up - # trunk-ignore(yamllint/quoted-strings) - range: "85...100" + range: 85...100 status: patch: default: diff --git a/pyproject.toml b/pyproject.toml index 0807619..2ecef0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "tracker" -version = "2.1.15" +version = "2.1.16" description = "A simple bug tracking API" authors = ["Masum Billal "] license = "LICENSE" From 1a689e7ee5cd0102a00a88559aaae8e4757eb299 Mon Sep 17 00:00:00 2001 From: Masum Billal Date: Sun, 16 Jun 2024 11:29:39 +0600 Subject: [PATCH 2/5] Update trunk.yaml --- .trunk/trunk.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e463d87..196afb7 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -37,8 +37,9 @@ lint: actions: disabled: - trunk-fmt-pre-commit + - trunk-check-pre-push enabled: - trunk-upgrade-available - trunk-announce - - trunk-check-pre-push + From b456ec8fc61d332c7bfe8dd4385210ad9bafcd94 Mon Sep 17 00:00:00 2001 From: Masum Billal Date: Sun, 16 Jun 2024 13:18:03 +0600 Subject: [PATCH 3/5] added pre-commit --- .trunk/trunk.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 196afb7..96ef94f 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -35,11 +35,8 @@ lint: - Dockerfile - .github/workflows/*.yml actions: - disabled: - - trunk-fmt-pre-commit - - trunk-check-pre-push enabled: - trunk-upgrade-available - trunk-announce - - + - trunk-fmt-pre-commit + - trunk-check-pre-push From 8c0131b49e130782f0fc258b84fc8bc5d4e06e33 Mon Sep 17 00:00:00 2001 From: Masum Billal Date: Sun, 16 Jun 2024 13:23:44 +0600 Subject: [PATCH 4/5] fixed ci --- .github/workflows/ci.yml | 7 ++++++- tox.ini | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b308a1..e4797a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,12 @@ jobs: - name: Trunk Check uses: trunk-io/trunk-action@main - - name: Upload coverage reports to Codecov + - if: ${{ github.event_name == 'push' && matrix.python-version == 3.12 }} + name: Export Coverage XML + run: tox -e coverage + + - if: ${{ github.event_name == 'push' && matrix.python-version == 3.12 }} + name: Upload coverage reports to Codecov uses: codecov/codecov-action@main with: diff --git a/tox.ini b/tox.ini index 2d96d73..2b0101b 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,9 @@ commands = poetry install --with dev poetry run coverage run --source=. -m pytest poetry run coverage report -m --fail-under=85 - poetry run coverage xml -o coverage.xml + +[testenv:coverage] +commands = poetry run coverage xml -o coverage.xml ; [testenv:docs-win32] From a7721a7fa37f86d83e3d99f66bab8d58432523cf Mon Sep 17 00:00:00 2001 From: Masum Billal Date: Sun, 16 Jun 2024 13:25:20 +0600 Subject: [PATCH 5/5] moved trunk up --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4797a9..1b07609 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,13 +28,14 @@ jobs: uses: actions/setup-python@master with: python-version: ${{ matrix.python-version }} + - name: Trunk Check + uses: trunk-io/trunk-action@main + - name: Tox run: | python -m pip install --upgrade pip python -m pip install -U tox tox - - name: Trunk Check - uses: trunk-io/trunk-action@main - if: ${{ github.event_name == 'push' && matrix.python-version == 3.12 }} name: Export Coverage XML