Skip to content

Commit f6a884d

Browse files
authored
Merge pull request #128 from StatFunGen/r45
support R 4.5
2 parents 65b564e + 2b5e1e1 commit f6a884d

File tree

4 files changed

+23
-45
lines changed

4 files changed

+23
-45
lines changed

.github/environment/pixi.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[project]
22
name = "r-colocboost"
33
channels = ["dnachun", "conda-forge", "bioconda"]
4-
platforms = ["linux-64", "osx-64", "osx-arm64"]
4+
platforms = ["linux-64", "osx-arm64"]
55

66
[system-requirements]
77
libc = { family="glibc", version="2.17" }
@@ -17,15 +17,15 @@ use_minor_version = "cd $GITHUB_WORKSPACE; R -e 'usethis::use_version(which = \"
1717
use_patch_version = "cd $GITHUB_WORKSPACE; R -e 'usethis::use_version(which = \"patch\", push = FALSE)'"
1818
pkgdown_build = "cd $GITHUB_WORKSPACE; R -e 'pkgdown::build_site_github_pages(new_process = FALSE, install = TRUE)'"
1919

20-
[feature.r43]
21-
dependencies = {"r-base" = "4.3.*"}
22-
2320
[feature.r44]
2421
dependencies = {"r-base" = "4.4.*"}
2522

23+
[feature.r45]
24+
dependencies = {"r-base" = "4.5.*"}
25+
2626
[environments]
27-
r43 = {features = ["r43"]}
2827
r44 = {features = ["r44"]}
28+
r45 = {features = ["r45"]}
2929

3030
[dependencies]
3131
"r-ashr" = "*"
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
r_base:
2-
- 4.3
2+
- 4.5

.github/workflows/ci.yml

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,27 @@ on:
77
- .gitignore
88
- README.md
99

10+
concurrency:
11+
group: ci-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
11-
ci_linux-64:
12-
name: linux-64 CI
13-
runs-on: ubuntu-latest
15+
ci:
16+
name: CI (${{ matrix.platform }} / ${{ matrix.environment }})
17+
runs-on: ${{ matrix.runner }}
1418
env:
1519
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1620
strategy:
1721
fail-fast: false
1822
matrix:
19-
environment: ["r43", "r44"]
20-
23+
runner: [ubuntu-latest, macos-latest]
24+
environment: ["r44", "r45"]
25+
include:
26+
- runner: ubuntu-latest
27+
platform: linux-64
28+
- runner: macos-latest
29+
platform: osx-arm64
30+
2131
steps:
2232
- name: Checkout pull request branch
2333
uses: actions/checkout@v6
@@ -44,37 +54,5 @@ jobs:
4454
pixi run --environment ${{ matrix.environment }} --manifest-path /tmp/pixi/pixi.toml rcmdcheck
4555
4656
- name: Check unit test code coverage
57+
if: matrix.runner == 'ubuntu-latest' && matrix.environment == 'r44'
4758
run: pixi run --environment ${{ matrix.environment }} --manifest-path /tmp/pixi/pixi.toml codecov
48-
49-
ci_osx-arm64:
50-
name: osx-arm64 CI
51-
runs-on: macos-14
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
environment: ["r43", "r44"]
56-
57-
steps:
58-
- name: Checkout pull request branch
59-
uses: actions/checkout@v6
60-
with:
61-
fetch-depth: 0
62-
63-
- name: Create TOML from recipe
64-
run: |
65-
.github/workflows/create_toml_from_yaml.sh ${GITHUB_WORKSPACE}
66-
mkdir /tmp/pixi
67-
mv ${GITHUB_WORKSPACE}/pixi.toml /tmp/pixi
68-
69-
- name: Setup pixi
70-
uses: prefix-dev/setup-pixi@v0.9.4
71-
with:
72-
manifest-path: /tmp/pixi/pixi.toml
73-
74-
- name: Run unit tests
75-
run: pixi run --environment ${{ matrix.environment }} --manifest-path /tmp/pixi/pixi.toml devtools_test
76-
77-
- name: Run R CMD CHECK
78-
run: |
79-
pixi run --environment ${{ matrix.environment }} --manifest-path /tmp/pixi/pixi.toml build
80-
pixi run --environment ${{ matrix.environment }} --manifest-path /tmp/pixi/pixi.toml rcmdcheck

.github/workflows/conda_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
variant: ["r43", "r44"]
22+
variant: ["r44", "r45"]
2323

2424
env:
2525
ANACONDA_API_KEY: ${{ secrets.ANACONDA_API_TOKEN }}

0 commit comments

Comments
 (0)