Skip to content

Commit dce178d

Browse files
committed
Fix Github Actions
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
1 parent ce13113 commit dce178d

5 files changed

Lines changed: 30 additions & 55 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/renovate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["local>fedora-infra/shared:renovate-config"]
4+
}

.github/workflows/dependabot-merge.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
on:
22
push:
3-
branches:
4-
- dev
53
pull_request:
6-
branches:
7-
- dev
84

9-
name: Run Tox tests
5+
name: Tests
106

117
jobs:
128
misc_tests:
139
name: Misc tests
10+
runs-on: ubuntu-latest
11+
container: fedorapython/fedora-python-tox:latest
1412
steps:
15-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
14+
- name: Install dependencies
15+
run: |
16+
dnf install -y git tox
17+
pip install poetry>=1.2
18+
- name: Mark the working directory as safe for Git
19+
run: git config --global --add safe.directory $PWD
1620
- name: Run tests
17-
uses: fedora-python/tox-github-action@main
18-
with:
19-
tox_env: ${{ matrix.tox_env }}
21+
run: tox -e ${{ matrix.tox_env }}
2022
strategy:
2123
matrix:
2224
tox_env:
2325
- lint
24-
runs-on: ubuntu-latest
26+
- format
2527

2628
unit_test:
2729
name: Unit tests
30+
runs-on: ubuntu-latest
31+
container: fedorapython/fedora-python-tox:latest
2832
steps:
29-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v4
34+
- name: Install dependencies
35+
run: |
36+
dnf install -y git tox
37+
pip install poetry>=1.2
38+
- name: Mark the working directory as safe for Git
39+
run: git config --global --add safe.directory $PWD
3040
- name: Run tests
31-
uses: fedora-python/tox-github-action@main
32-
with:
33-
tox_env: ${{ matrix.tox_env }},diff-cover
34-
- name: Upload coverage to Codecov
35-
uses: codecov/codecov-action@v1
36-
with:
37-
name: ${{ matrix.tox_env }}
38-
flags: unittests
39-
env_vars: PYTHON
40-
fail_ci_if_error: true
41+
run: tox -e ${{ matrix.tox_env }},diff-cover
4142
strategy:
4243
matrix:
4344
tox_env:
44-
- py36
45-
- py37
4645
- py38
47-
runs-on: ubuntu-latest
46+
- py39
47+
- py310
48+
- py311

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ passenv = HOME
2121

2222
[testenv:diff-cover]
2323
commands =
24-
poetry run diff-cover coverage.xml --compare-branch=origin/develop --fail-under=100
24+
poetry run diff-cover coverage.xml --compare-branch=origin/main --fail-under=100
2525

2626
[testenv:lint]
2727
commands =

0 commit comments

Comments
 (0)