Skip to content

Commit e873b4f

Browse files
authored
Merge pull request #3644 from infotroph/drop-R4.1
[build] drop R4.1, add R4.5
2 parents ffecef7 + 27e2a16 commit e873b4f

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

.github/workflows/ci-weekly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
R:
16-
- "4.1"
1716
- "4.3"
17+
- "4.5"
1818
- "devel"
1919
uses: ./.github/workflows/test.yml
2020
with:
@@ -26,8 +26,8 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
R:
29-
- "4.1"
3029
- "4.3"
30+
- "4.5"
3131
- "devel"
3232
uses: ./.github/workflows/check.yml
3333
with:
@@ -40,8 +40,8 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
R:
43-
- "4.1"
4443
- "4.3"
44+
- "4.5"
4545
- "devel"
4646
uses: ./.github/workflows/sipnet.yml
4747
with:

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ on:
2020
type: choice
2121
default: "$DEFAULT_R_VERSION"
2222
options:
23-
- 4.1
2423
- 4.2
2524
- 4.3
2625
- 4.4
26+
- 4.5
2727
- devel
2828
schedule:
2929
# 1:30 AM UTC, different R version each day
3030
- cron: '30 1 * * 1' # Rdevel
31-
- cron: '30 1 * * 2' # R4.4
31+
- cron: '30 1 * * 2' # R4.2
3232
- cron: '30 1 * * 3' # R4.3
33-
- cron: '30 1 * * 4' # R4.2
34-
- cron: '30 1 * * 5' # R4.1
33+
- cron: '30 1 * * 4' # R4.4
34+
- cron: '30 1 * * 5' # R4.5
3535

3636
jobs:
3737
# ----------------------------------------------------------------------
@@ -49,16 +49,16 @@ jobs:
4949
run: echo "R_VERSION=devel" >> "$GITHUB_OUTPUT"
5050
- id: tue
5151
if: github.event.schedule == '30 1 * * 2'
52-
run: echo "R_VERSION=4.4" >> "$GITHUB_OUTPUT"
52+
run: echo "R_VERSION=4.2" >> "$GITHUB_OUTPUT"
5353
- id: wed
5454
if: github.event.schedule == '30 1 * * 3'
5555
run: echo "R_VERSION=4.3" >> "$GITHUB_OUTPUT"
5656
- id: thu
5757
if: github.event.schedule == '30 1 * * 4'
58-
run: echo "R_VERSION=4.2" >> "$GITHUB_OUTPUT"
58+
run: echo "R_VERSION=4.4" >> "$GITHUB_OUTPUT"
5959
- id: fri
6060
if: github.event.schedule == '30 1 * * 5'
61-
run: echo "R_VERSION=4.1" >> "$GITHUB_OUTPUT"
61+
run: echo "R_VERSION=4.5" >> "$GITHUB_OUTPUT"
6262
- id: default
6363
if: github.event_name != 'schedule'
6464
run: echo "R_VERSION=${{ github.event.inputs.r_version || env.DEFAULT_R_VERSION }}" >> "$GITHUB_OUTPUT"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ section for the next release.
4242
- `extract_soil_gssurgo` now supports spatial sampling using a grid of user-defined size and spacing. And supports ensemble simulation of soil organic carbon (SOC) stocks, using area-weighted aggregation
4343
- The ERA5 NC extraction function can now handle multi-site instead of one
4444
- All of the `met2model.*` functions no longer write a list of variables (`*.nc.var`) file alongside each output netcdf. If you need var files, use `PEcAn.utils::nc_write_vars()` after the run completes (#3611, #3616).
45+
- Stopped testing on R 4.1, started testing on R 4.5, and updated prebuilt Docker images to match -- they are now available for R releases 4.2 through 4.5 as well as for R under development.
4546
- `write.config.STICS()` now modifies parameters with vectors rather than individually.
4647

4748

0 commit comments

Comments
 (0)