Skip to content

Commit bb37a80

Browse files
committed
Adapt test workflows to new test mechanism
and remove lengthy tests from regular testing
1 parent 7f487e6 commit bb37a80

File tree

2 files changed

+9
-34
lines changed

2 files changed

+9
-34
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,8 @@ on:
88
workflow_dispatch:
99

1010
jobs:
11-
resources:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout code
15-
uses: actions/checkout@v4
16-
17-
- name: Create resource cache
18-
id: cache
19-
uses: actions/cache@v4
20-
with:
21-
path: ./fortran_tests/before/*/
22-
key: resources-${{ github.event_name }}
23-
24-
- name: Prepare tests (default)
25-
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
26-
run: |
27-
.travis/prep_regular.sh
28-
29-
- name: Prepare tests (schedule)
30-
if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name == 'schedule' }}
31-
run: |
32-
.travis/prep_cron.sh
3311

3412
pip:
35-
needs:
36-
- resources
3713
runs-on: ${{ matrix.os }}
3814
strategy:
3915
fail-fast: false
@@ -45,22 +21,21 @@ jobs:
4521
- name: Checkout code
4622
uses: actions/checkout@v4
4723

48-
- name: Load resources
49-
uses: actions/cache@v4
50-
with:
51-
path: ./fortran_tests/before/*/
52-
key: resources-${{ github.event_name }}
53-
5424
- uses: actions/setup-python@v5
5525
with:
5626
python-version: ${{ matrix.python }}
5727

5828
- name: Install project & dependencies
5929
run: pip install .[dev]
6030

61-
- name: Run tests
31+
- name: Run unit and short integration tests
32+
run: |
33+
coverage run --source=fprettify run_tests.py -s unittests -s builtin -s regular
34+
35+
- name: Run long integration tests
36+
if: ${{ github.event_name == 'schedule' }}
6237
run: |
63-
coverage run --source=fprettify setup.py test
38+
coverage run --source=fprettify run_tests.py -s cron
6439
6540
- name: Coverage upload
6641
run: coveralls --service=github

fortran_tests/testsuites.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ suite: regular
1515
obtain: git.Repo.clone_from("https://github.com/wannier-developers/wannier90", "wannier90", branch="v3.1.0")
1616
path: wannier90/src
1717
options: --indent 2
18-
suite: regular
18+
suite: cron
1919

2020
[cp2k]
2121
obtain: git.Repo.clone_from("https://github.com/cp2k/cp2k.git", "cp2k", branch="v2024.1")
@@ -26,4 +26,4 @@ suite: cron
2626
[flap]
2727
obtain: git.Repo.clone_from("https://github.com/szaghi/FLAP", "FLAP", branch="v1.2.5")
2828
path: FLAP
29-
suite: regular
29+
suite: cron

0 commit comments

Comments
 (0)