Skip to content

Commit a5a21e5

Browse files
authored
Merge pull request #66 from europanite/feature/develop
Feature/develop
2 parents fdf20f2 + faad702 commit a5a21e5

4 files changed

Lines changed: 28 additions & 31 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ on:
33
push:
44
pull_request:
55
workflow_dispatch:
6-
schedule:
7-
- cron: '0 0 * * *'
6+
87
concurrency:
98
group: ${{ github.workflow }}-${{ github.ref }}
109
cancel-in-progress: true
@@ -19,9 +18,9 @@ jobs:
1918
matrix:
2019
os: [ ubuntu-latest ]
2120
steps:
22-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2322
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@v3
23+
uses: docker/setup-buildx-action@v4
2524
- name: Build service TEST image
2625
env:
2726
DOCKER_BUILDKIT: 1
@@ -33,7 +32,7 @@ jobs:
3332
- name: Save images for downstream jobs
3433
run: |
3534
docker save local/service-test:ci | gzip > service-test.tar.gz
36-
- uses: actions/upload-artifact@v4
35+
- uses: actions/upload-artifact@v6
3736
with:
3837
name: test-images
3938
path: service-test.tar.gz
@@ -45,11 +44,11 @@ jobs:
4544
strategy:
4645
fail-fast: false
4746
matrix:
48-
os: [ ubuntu-latest ]
47+
os: [ubuntu-latest]
4948
needs: build-test-images
5049
steps:
51-
- uses: actions/checkout@v4
52-
- uses: actions/download-artifact@v4
50+
- uses: actions/checkout@v6
51+
- uses: actions/download-artifact@v6
5352
with:
5453
name: test-images
5554
- name: Load images
@@ -63,7 +62,7 @@ jobs:
6362
python -m coverage run -m pytest
6463
'
6564
- name: Upload coverage xml
66-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v6
6766
with:
6867
name: coverage-xml
6968
path: service/reports/ci/coverage.xml

.github/workflows/codeql.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ on:
1616
branches: [ "main" ]
1717
pull_request:
1818
branches: [ "main" ]
19-
schedule:
20-
- cron: '0 0 * * *'
2119

2220
jobs:
2321
analyze:
@@ -57,7 +55,7 @@ jobs:
5755
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5856
steps:
5957
- name: Checkout repository
60-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
6159

6260
# Add any setup steps before running the `github/codeql-action/init` action.
6361
# This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/lint.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ on:
33
push:
44
workflow_dispatch:
55
pull_request:
6-
schedule:
7-
- cron: '0 0 * * *'
6+
87
permissions:
98
security-events: write
109
jobs:
@@ -14,15 +13,16 @@ jobs:
1413
strategy:
1514
fail-fast: false
1615
matrix:
17-
os: [ ubuntu-latest, windows-latest ]
18-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
16+
os: [ubuntu-latest, macos-latest, windows-latest]
17+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" ]
1918
steps:
20-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2120
- name: Setup Python
22-
uses: actions/setup-python@v5
21+
uses: actions/setup-python@v6
2322
with:
2423
python-version: ${{ matrix.python-version }}
2524
cache: "pip"
25+
cache-dependency-path: service/requirements.test.txt
2626
- name: Install tools
2727
run: |
2828
python -m pip install -U pip

.github/workflows/pytest.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ on:
33
push:
44
pull_request:
55
workflow_dispatch:
6-
schedule:
7-
- cron: '0 0 * * *'
6+
87
concurrency:
98
group: ${{ github.workflow }}-${{ github.ref }}
109
cancel-in-progress: true
@@ -18,38 +17,39 @@ jobs:
1817
strategy:
1918
fail-fast: false
2019
matrix:
21-
os: [ ubuntu-latest, windows-latest ]
22-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
20+
os: [ubuntu-latest, macos-latest, windows-latest]
21+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" ]
2322
env:
2423
PYTHONUTF8: "1"
2524
PYTHONPATH: ${{ github.workspace }}/service
2625
steps:
2726
- name: Checkout
28-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2928

3029
- name: Set up Python
31-
uses: actions/setup-python@v5
30+
uses: actions/setup-python@v6
3231
with:
3332
python-version: ${{ matrix.python-version }}
3433
cache: "pip"
34+
cache-dependency-path: service/requirements.test.txt
3535

36-
- name: Install deps (Ubuntu)
37-
if: matrix.os == 'ubuntu-latest'
36+
- name: Install deps (Unix)
37+
if: matrix.os != 'windows-latest'
3838
shell: bash
3939
run: |
4040
set -eux
4141
python -m pip install -U pip
42-
pip install -r service/requirements.test.txt
42+
python -m pip install -r service/requirements.test.txt
4343
if [ -f service/pyproject.toml ] || [ -f service/setup.cfg ] || [ -f service/setup.py ]; then
44-
pip install -e service
44+
python -m pip install -e service
4545
fi
4646
- name: Install deps (Windows)
4747
if: matrix.os == 'windows-latest'
4848
shell: pwsh
4949
run: |
5050
$ErrorActionPreference = "Stop"
5151
python -m pip install -U pip
52-
pip install -r service/requirements.test.txt
52+
python -m pip install -r service/requirements.test.txt
5353
$hasPythonProject = (Test-Path -Path 'service/pyproject.toml') -or
5454
(Test-Path -Path 'service/setup.cfg') -or
5555
(Test-Path -Path 'service/setup.py')
@@ -63,15 +63,15 @@ jobs:
6363
run: |
6464
python --version
6565
pip --version
66-
pytest --version
66+
python -m pytest --version
6767
python -c "import sys,platform,os;print(platform.platform());print(sys.version);print('PYTHONPATH=',os.environ.get('PYTHONPATH'))"
6868
- name: Run tests with coverage
6969
shell: bash
7070
run: |
7171
python -m coverage run -m pytest -q
7272
python -m coverage xml -o coverage.xml
7373
- name: Upload coverage.xml
74-
uses: actions/upload-artifact@v4
74+
uses: actions/upload-artifact@v6
7575
with:
7676
name: coverage-${{ matrix.os }}-py${{ matrix.python-version }}
7777
path: coverage.xml

0 commit comments

Comments
 (0)