Skip to content

Commit 51ee9c0

Browse files
committed
Merge branch 'master' into fix-schema
2 parents 1212e60 + c7fa8ef commit 51ee9c0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.github/workflows/job.test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches:
66
- master
77
- 2.x
8+
- 3.x
89
pull_request:
910
branches:
1011
- master
1112
- 2.x
13+
- 3.x
1214
workflow_dispatch:
1315

1416
# TODO: might need to tweak `group`

binder/environment.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ dependencies:
2626
- ruamel_yaml
2727
# for R language server and kernel
2828
- r
29+
# workaround for https://github.com/jupyterhub/repo2docker/issues/1140
30+
- r-base=4.0
2931
- r-irkernel
3032
- r-languageserver
3133
- rpy2

0 commit comments

Comments
 (0)