Skip to content

Commit 4a1abc3

Browse files
authored
Merge pull request #1264 from RcppCore/feature/docker_ci_improvement
Simplified container use thanks to hint by @Enchufa2
2 parents 72c1a63 + dc3263e commit 4a1abc3

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Run CI for R using https://eddelbuettel.github.io/r-ci/
2+
# This file is a slight variant by running a matrix of containers
23

34
name: ci
45

@@ -12,7 +13,12 @@ env:
1213

1314
jobs:
1415
ci:
16+
1517
runs-on: ubuntu-latest
18+
19+
container:
20+
image: ${{ matrix.cntr }}
21+
1622
strategy:
1723
matrix:
1824
include:
@@ -44,17 +50,14 @@ jobs:
4450
# chmod 0755 run.sh
4551
# ./run.sh bootstrap
4652

47-
- name: Container
48-
run: docker pull ${{ matrix.cntr }}
49-
5053
- name: SessionInfo
51-
run: docker run --rm -i -v ${PWD}:/mnt -w /mnt ${{ matrix.cntr }} ${{ matrix.r }} -q -e 'sessionInfo()'
54+
run: ${{ matrix.r }} -q -e 'sessionInfo()'
5255

5356
- name: Build
54-
run: docker run --rm -i -v ${PWD}:/mnt -w /mnt ${{ matrix.cntr }} ${{matrix.r }} CMD build --no-build-vignettes --no-manual .
57+
run: ${{matrix.r }} CMD build --no-build-vignettes --no-manual .
5558

5659
- name: Check
57-
run: docker run --rm -i -v ${PWD}:/mnt -w /mnt -e CI=true ${{ matrix.cntr }} ${{ matrix.r }} CMD check --no-vignettes --no-manual Rcpp_*.tar.gz
60+
run: CI=true ${{ matrix.r }} CMD check --no-vignettes --no-manual Rcpp_*.tar.gz
5861

5962
#covr:
6063
# runs-on: ubuntu-latest

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2023-04-12 Dirk Eddelbuettel <[email protected]>
2+
3+
* .github/workflows/ci.yaml: Simplified container use
4+
15
2023-03-27 Dirk Eddelbuettel <[email protected]>
26

37
* .github/workflows/stale.yaml: Roll to v8

0 commit comments

Comments
 (0)