Skip to content

Commit b533b5e

Browse files
LourensVeenLourensVeen
committed
Fix compat tests
1 parent b694bca commit b533b5e

62 files changed

Lines changed: 193 additions & 129 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test-aarsethzare.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE aarsethzare
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-aarsethzare.yml
6+
# - .github/workflows/test-aarsethzare.yml
77
- 'src/amuse_aarsethzare/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-aarsethzare.yml
10+
# - .github/workflows/test-aarsethzare.yml
1111
- 'src/amuse_aarsethzare/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-adaptb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE adaptb
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-adaptb.yml
6+
# - .github/workflows/test-adaptb.yml
77
- 'src/amuse_adaptb/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-adaptb.yml
10+
# - .github/workflows/test-adaptb.yml
1111
- 'src/amuse_adaptb/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-athena.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE athena
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-athena.yml
6+
# - .github/workflows/test-athena.yml
77
- 'src/amuse_athena/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-athena.yml
10+
# - .github/workflows/test-athena.yml
1111
- 'src/amuse_athena/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-bhtree.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE bhtree
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-bhtree.yml
6+
# - .github/workflows/test-bhtree.yml
77
- 'src/amuse_bhtree/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-bhtree.yml
10+
# - .github/workflows/test-bhtree.yml
1111
- 'src/amuse_bhtree/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-brutus.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE brutus
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-brutus.yml
6+
# - .github/workflows/test-brutus.yml
77
- 'src/amuse_brutus/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-brutus.yml
10+
# - .github/workflows/test-brutus.yml
1111
- 'src/amuse_brutus/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-bse.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE bse
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-bse.yml
6+
# - .github/workflows/test-bse.yml
77
- 'src/amuse_bse/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-bse.yml
10+
# - .github/workflows/test-bse.yml
1111
- 'src/amuse_bse/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-capreole.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Test AMUSE capreole
33
on:
44
push:
55
paths:
6-
- .github/workflows/test-capreole.yml
6+
# - .github/workflows/test-capreole.yml
77
- 'src/amuse_capreole/**'
88
pull_request:
99
paths:
10-
- .github/workflows/test-capreole.yml
10+
# - .github/workflows/test-capreole.yml
1111
- 'src/amuse_capreole/**'
1212
workflow_dispatch:
1313

‎.github/workflows/test-compat-conda.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Test Conda compatibility and regressions
33
on:
44
schedule:
55
- cron: "0 2 * * 0"
6+
pull_request:
7+
branches:
8+
- main
69
workflow_dispatch:
710

811
jobs:

‎.github/workflows/test-compat-venv-apt.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Test compatibility on Ubuntu with venv/apt
33
on:
44
schedule:
55
- cron: "0 3 * * 0"
6-
push:
6+
pull_request:
77
branches:
8-
- issue-1144-new-continuous-integration
8+
- main
99
workflow_dispatch:
1010

1111
jobs:
@@ -28,7 +28,8 @@ jobs:
2828
steps:
2929
- name: Install dependencies
3030
run: |
31-
apt-get install -y gcc g++ gfortran python3 python3-dev pkg-config curl patch tar unnzip gzip bzip2 xz-utils perl bison make cmake libopenmpi-dev openmpi-bin libgsl-dev libfftw3-dev libgmp3-dev libmpfr6 libmpfr-dev libhdf5-dev hdf5-tools libnetcdf-dev libqhull-dev libhealpix-cxx-dev liblapack-dev libblas-dev
31+
sudo apt-get update
32+
sudo apt-get install -y gcc g++ gfortran python3 python3-dev pkg-config curl patch tar unzip gzip bzip2 xz-utils perl bison make cmake libopenmpi-dev openmpi-bin libgsl-dev libfftw3-dev libgmp3-dev libmpfr6 libmpfr-dev libhdf5-dev hdf5-tools libnetcdf-dev libqhull-dev libhealpix-cxx-dev liblapack-dev libblas-dev
3233
3334
- name: Checkout
3435
uses: actions/checkout@v4
@@ -37,7 +38,12 @@ jobs:
3738
fetch-tags: true
3839

3940
- name: Create virtualenv
40-
run: python3 -m venv venv
41+
run: |
42+
python3 -m venv venv
43+
. venv/bin/activate && python3 -m pip install pip wheel pytest
44+
45+
- name: Check set-up
46+
run: . venv/bin/activate && ./setup
4147

4248
- name: Build everything we can
4349
run: . venv/bin/activate && ./setup install all

‎.github/workflows/test-compat-venv-homebrew.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Test compatibility on macOS with venv/Homebrew
33
on:
44
schedule:
55
- cron: "0 4 * * 0"
6-
push:
6+
pull_request:
77
branches:
8-
- issue-1144-new-continuous-integration
8+
- main
99
workflow_dispatch:
1010

1111
jobs:
@@ -36,16 +36,23 @@ jobs:
3636
fetch-tags: true
3737

3838
- name: Create virtualenv
39-
run: python3 -m venv venv
39+
run: |
40+
python3 -m venv venv
41+
. venv/bin/activate && python3 -m pip install pip wheel pytest
42+
43+
- name: Check set-up
44+
run: |
45+
. venv/bin/activate && FC=/opt/homebrew/bin/gfortran-13 ./setup
46+
cat support/config.log
4047
4148
- name: Build everything we can
42-
run: . venv/bin/activate && ./setup install all
49+
run: . venv/bin/activate && FC=/opt/homebrew/bin/gfortran-13 ./setup install all
4350

4451
- name: Ensure we test only the installed packages
45-
run: . venv/bin/activate && ./setup distclean
52+
run: . venv/bin/activate && FC=/opt/homebrew/bin/gfortran-13 ./setup distclean
4653

4754
- name: Test all
48-
run: . venv/bin/activate && ./setup test all
55+
run: . venv/bin/activate && FC=/opt/homebrew/bin/gfortran-13 ./setup test all
4956

5057
- name: Archive build logs
5158
if: always()

0 commit comments

Comments
 (0)