Skip to content

Commit e7c861c

Browse files
committed
Merge branch 'main' into multi-plants
2 parents 1b7f288 + 8e601d5 commit e7c861c

39 files changed

Lines changed: 835 additions & 187 deletions

.github/workflows/Benchmarks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: Benchmarks
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [ main ]
55
workflow_dispatch:
66
permissions:
77
pull-requests: write
88
jobs:
99
bench:
10-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
10+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{
11+
github.event_name }}
1112
runs-on: ${{ matrix.os }}
1213
timeout-minutes: 60
1314
strategy:
@@ -24,3 +25,4 @@ jobs:
2425
with:
2526
julia-version: ${{ matrix.version }}
2627
bench-on: ${{ github.event.pull_request.head.sha }}
28+
extra-pkgs: https://github.com/PalmStudio/XPalm.jl,https://github.com/VEZY/PlantBiophysics.jl

.github/workflows/CI.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ concurrency:
1313
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1414
jobs:
1515
test:
16-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
16+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
1717
runs-on: ${{ matrix.os }}
1818
timeout-minutes: 60
19-
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
19+
permissions:
20+
# needed to allow julia-actions/cache to proactively delete old caches that it has created
2021
actions: write
2122
contents: read
2223
strategy:
@@ -29,21 +30,18 @@ jobs:
2930
- ubuntu-latest
3031
- macOS-latest
3132
- windows-latest
32-
arch:
33-
- x64
3433
steps:
3534
- uses: actions/checkout@v6
36-
- uses: julia-actions/setup-julia@v2
35+
- uses: julia-actions/setup-julia@v3
3736
with:
3837
version: ${{ matrix.version }}
39-
arch: ${{ matrix.arch }}
40-
- uses: julia-actions/cache@v2
38+
- uses: julia-actions/cache@v3
4139
- uses: julia-actions/julia-buildpkg@v1
4240
- uses: julia-actions/julia-runtest@v1
4341
env:
4442
JULIA_NUM_THREADS: 4
4543
- uses: julia-actions/julia-processcoverage@v1
46-
- uses: codecov/codecov-action@v5
44+
- uses: codecov/codecov-action@v6
4745
with:
4846
files: lcov.info
4947
docs:
@@ -55,10 +53,10 @@ jobs:
5553
statuses: write
5654
steps:
5755
- uses: actions/checkout@v6
58-
- uses: julia-actions/setup-julia@v2
56+
- uses: julia-actions/setup-julia@v3
5957
with:
6058
version: "1"
61-
- uses: julia-actions/cache@v2
59+
- uses: julia-actions/cache@v3
6260
- name: Configure doc environment
6361
shell: julia --project=docs --color=yes {0}
6462
run: |

.github/workflows/Integration.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ concurrency:
1313
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1414
jobs:
1515
test:
16-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
16+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
1717
runs-on: ${{ matrix.os }}
1818
timeout-minutes: 60
19-
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
19+
permissions:
20+
# needed to allow julia-actions/cache to proactively delete old caches that it has created
2021
actions: write
2122
contents: read
2223
strategy:
@@ -26,22 +27,14 @@ jobs:
2627
- "1"
2728
os:
2829
- ubuntu-latest
29-
arch:
30-
- x64
3130
package:
3231
- { user: PalmStudio, repo: XPalm.jl, branch: main, default: main }
33-
- {
34-
user: VEZY,
35-
repo: PlantBioPhysics.jl,
36-
branch: master,
37-
default: master,
38-
}
32+
- { user: VEZY, repo: PlantBioPhysics.jl, branch: master, default: master }
3933
steps:
4034
- uses: actions/checkout@v6
41-
- uses: julia-actions/setup-julia@v2
35+
- uses: julia-actions/setup-julia@v3
4236
with:
4337
version: ${{ matrix.version }}
44-
arch: ${{ matrix.arch }}
4538
- uses: julia-actions/julia-buildpkg@v1
4639
- name: Clone Downstream
4740
uses: actions/checkout@v6
@@ -72,6 +65,6 @@ jobs:
7265
echo "This action requires the downstream dependencies' branches to be set to their main/master to succeed. Please switch them back and ensure tests pass before merging"
7366
exit 1
7467
- uses: julia-actions/julia-processcoverage@v1
75-
- uses: codecov/codecov-action@v5
68+
- uses: codecov/codecov-action@v6
7669
with:
7770
files: lcov.info

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
docs/Manifest.toml
77
test/Manifest.toml
88
docs/build/
9-
benchmark/Manifest.toml
9+
benchmark/Manifest.toml
10+
frontend

0 commit comments

Comments
 (0)