Skip to content

Commit a4672eb

Browse files
schloerkeschloerke
committed
Setup init RSPM
1 parent 0870144 commit a4672eb

File tree

4 files changed

+35
-5
lines changed

4 files changed

+35
-5
lines changed

‎.github/workflows/apps-config.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ on:
1616
value: "windows-latest"
1717
ubuntu:
1818
description: ubuntu OS value
19-
value: "ubuntu-latest"
19+
value: "ubuntu-24.04"
20+
rspm-macos:
21+
description: macOS RSPM
22+
value: "https://p3m.dev/cran/latest"
23+
rspm-windows:
24+
description: windows RSPM
25+
value: "https://p3m.dev/cran/latest"
26+
rpspm-ubuntu:
27+
description: ubuntu RSPM
28+
value: "https://p3m.dev/cran/__linux__/noble/latest"
2029
cache-version:
2130
description: cache-version to be used when pulling library cache
2231
value: "8"

‎.github/workflows/apps-test-matrix.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,39 @@ jobs:
3232
r-version: ${{ needs.config.outputs.release }}
3333
os: ${{ needs.config.outputs.macos }}
3434
cache-version: ${{ needs.config.outputs.cache-version }}
35+
rspm: ${{ needs.config.outputs.rspm-macos }}
3536
macos-oldrel-1:
3637
needs: [config]
3738
uses: ./.github/workflows/apps-test-os.yml
3839
with:
3940
r-version: ${{ needs.config.outputs.oldrel1 }}
4041
os: ${{ needs.config.outputs.macos }}
4142
cache-version: ${{ needs.config.outputs.cache-version }}
43+
rspm: ${{ needs.config.outputs.rspm-macos }}
4244
macos-oldrel-2:
4345
needs: [config]
4446
uses: ./.github/workflows/apps-test-os.yml
4547
with:
4648
r-version: ${{ needs.config.outputs.oldrel2 }}
4749
os: ${{ needs.config.outputs.macos }}
4850
cache-version: ${{ needs.config.outputs.cache-version }}
51+
rspm: ${{ needs.config.outputs.rspm-macos }}
4952
macos-oldrel-3:
5053
needs: [config]
5154
uses: ./.github/workflows/apps-test-os.yml
5255
with:
5356
r-version: ${{ needs.config.outputs.oldrel3 }}
5457
os: ${{ needs.config.outputs.macos }}
5558
cache-version: ${{ needs.config.outputs.cache-version }}
59+
rspm: ${{ needs.config.outputs.rspm-macos }}
5660
macos-oldrel-4:
5761
needs: [config]
5862
uses: ./.github/workflows/apps-test-os.yml
5963
with:
6064
r-version: ${{ needs.config.outputs.oldrel4 }}
6165
os: ${{ needs.config.outputs.macos }}
6266
cache-version: ${{ needs.config.outputs.cache-version }}
67+
rspm: ${{ needs.config.outputs.rspm-macos }}
6368

6469
ubuntu-release:
6570
needs: [config]
@@ -68,34 +73,39 @@ jobs:
6873
r-version: ${{ needs.config.outputs.release }}
6974
os: ${{ needs.config.outputs.ubuntu }}
7075
cache-version: ${{ needs.config.outputs.cache-version }}
76+
rspm: ${{ needs.config.outputs.rspm-ubuntu }}
7177
ubuntu-oldrel-1:
7278
needs: [config]
7379
uses: ./.github/workflows/apps-test-os.yml
7480
with:
7581
r-version: ${{ needs.config.outputs.oldrel1 }}
7682
os: ${{ needs.config.outputs.ubuntu }}
7783
cache-version: ${{ needs.config.outputs.cache-version }}
84+
rspm: ${{ needs.config.outputs.rspm-ubuntu }}
7885
ubuntu-oldrel-2:
7986
needs: [config]
8087
uses: ./.github/workflows/apps-test-os.yml
8188
with:
8289
r-version: ${{ needs.config.outputs.oldrel2 }}
8390
os: ${{ needs.config.outputs.ubuntu }}
8491
cache-version: ${{ needs.config.outputs.cache-version }}
92+
rspm: ${{ needs.config.outputs.rspm-ubuntu }}
8593
ubuntu-oldrel-3:
8694
needs: [config]
8795
uses: ./.github/workflows/apps-test-os.yml
8896
with:
8997
r-version: ${{ needs.config.outputs.oldrel3 }}
9098
os: ${{ needs.config.outputs.ubuntu }}
9199
cache-version: ${{ needs.config.outputs.cache-version }}
100+
rspm: ${{ needs.config.outputs.rspm-ubuntu }}
92101
ubuntu-oldrel-4:
93102
needs: [config]
94103
uses: ./.github/workflows/apps-test-os.yml
95104
with:
96105
r-version: ${{ needs.config.outputs.oldrel4 }}
97106
os: ${{ needs.config.outputs.ubuntu }}
98107
cache-version: ${{ needs.config.outputs.cache-version }}
108+
rspm: ${{ needs.config.outputs.rspm-ubuntu }}
99109

100110
windows-release:
101111
needs: [config]
@@ -104,34 +114,39 @@ jobs:
104114
r-version: ${{ needs.config.outputs.release }}
105115
os: ${{ needs.config.outputs.windows }}
106116
cache-version: ${{ needs.config.outputs.cache-version }}
117+
rspm: ${{ needs.config.outputs.rspm-windows }}
107118
windows-oldrel-1:
108119
needs: [config]
109120
uses: ./.github/workflows/apps-test-os.yml
110121
with:
111122
r-version: ${{ needs.config.outputs.oldrel1 }}
112123
os: ${{ needs.config.outputs.windows }}
113124
cache-version: ${{ needs.config.outputs.cache-version }}
125+
rspm: ${{ needs.config.outputs.rspm-windows }}
114126
windows-oldrel-2:
115127
needs: [config]
116128
uses: ./.github/workflows/apps-test-os.yml
117129
with:
118130
r-version: ${{ needs.config.outputs.oldrel2 }}
119131
os: ${{ needs.config.outputs.windows }}
120132
cache-version: ${{ needs.config.outputs.cache-version }}
133+
rspm: ${{ needs.config.outputs.rspm-windows }}
121134
windows-oldrel-3:
122135
needs: [config]
123136
uses: ./.github/workflows/apps-test-os.yml
124137
with:
125138
r-version: ${{ needs.config.outputs.oldrel3 }}
126139
os: ${{ needs.config.outputs.windows }}
127140
cache-version: ${{ needs.config.outputs.cache-version }}
141+
rspm: ${{ needs.config.outputs.rspm-windows }}
128142
windows-oldrel-4:
129143
needs: [config]
130144
uses: ./.github/workflows/apps-test-os.yml
131145
with:
132146
r-version: ${{ needs.config.outputs.oldrel4 }}
133147
os: ${{ needs.config.outputs.windows }}
134148
cache-version: ${{ needs.config.outputs.cache-version }}
149+
rspm: ${{ needs.config.outputs.rspm-windows }}
135150

136151
build-results:
137152
uses: ./.github/workflows/build-results.yml

‎.github/workflows/apps-test-os.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ on:
77
required: false
88
os:
99
type: string
10-
default: ubuntu-latest
10+
default: ubuntu-24.04
11+
required: false
12+
rspm:
13+
type: string
14+
default: "https://p3m.dev/cran/__linux__/noble/latest"
1115
required: false
1216
extra-key:
1317
type: string
@@ -45,13 +49,14 @@ jobs:
4549
env:
4650
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
4751
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
52+
RSPM: ${{ inputs.rspm }}
4853

4954
steps:
5055
- name: Set up JDK 11
5156
uses: actions/setup-java@v3
5257
with:
53-
distribution: 'temurin'
54-
java-version: '11'
58+
distribution: "temurin"
59+
java-version: "11"
5560

5661
- name: Windows git setup
5762
if: runner.os == 'Windows'
@@ -135,7 +140,7 @@ jobs:
135140
cat("name=gha-", '${{ steps.failed_branch.outputs.name }}', '-', '${{ steps.short.outputs.r-version }}', '-', '${{ runner.os }}', "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE)
136141
137142
- name: Use chrome-headless-shell@latest-stable
138-
id: setup_chromote
143+
id: setup_chromote
139144
shell: Rscript {0}
140145
run: |
141146
path <- chromote::chrome_versions_add("latest-stable", binary = "chrome-headless-shell")

‎R/install.R‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ shinyverse_repos_option <- function() {
2020
c(
2121
# Use the shinycoreci universe to avoid GH rate limits!
2222
"AAA" = shinyverse_cran_url,
23+
"RSPM" = Sys.getenv("RSPM", NULL),
2324
getOption("repos", c("CRAN" = "https://cloud.r-project.org"))
2425
)
2526
}

0 commit comments

Comments
 (0)