Skip to content

Commit 05ae55b

Browse files
krlmlrkrlmlr
committed
Harmonize
1 parent d25a099 commit 05ae55b

File tree

4 files changed

+46
-19
lines changed

4 files changed

+46
-19
lines changed

‎.github/workflows/R-CMD-check-dev.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ jobs:
277277
_R_CHECK_SYSTEM_CLOCK_: false
278278
_R_CHECK_FUTURE_FILE_TIMESTAMPS_: false
279279
run: |
280+
options(crayon.enabled = TRUE)
280281
error_on <- "note"
281282
# Begin custom: rcmdcheck error_on
282283
# End custom: rcmdcheck error_on
@@ -285,7 +286,8 @@ jobs:
285286

286287
- name: Show test output
287288
if: always()
288-
run: find check -name '*.Rout*' -exec head -n 1000000 '{}' \; || true
289+
run: |
290+
find check -name '*.Rout*' -exec head -n 1000000 '{}' \; || true
289291
shell: bash
290292

291293
- name: Upload check results

‎.github/workflows/R-CMD-check.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ jobs:
114114
eval sudo $cmd
115115
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "${{matrix.config.os-version}}"))')
116116
117+
- name: Add fake qpdf and checkbashisms
118+
if: runner.os == 'Linux'
119+
run: |
120+
sudo ln -s $(which true) /usr/local/bin/qpdf
121+
sudo ln -s $(which true) /usr/local/bin/checkbashisms
122+
117123
- name: Install dependencies
118124
run: |
119125
remotes::install_deps(dependencies = TRUE, type = .Platform$pkgType)

‎.github/workflows/pkgdown.yaml‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
# Begin custom: services
2626
# End custom: services
2727
env:
28+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2829
RSPM: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"
2930
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3031
# prevent rgl issues because no X11 display is available
@@ -40,6 +41,24 @@ jobs:
4041

4142
- uses: actions/checkout@v2
4243

44+
- name: Install pkgdown sysdeps
45+
if: runner.os == 'Linux'
46+
env:
47+
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
48+
run: |
49+
# Needed because of install-r: false
50+
sudo apt-get update
51+
# For some reason harfbuzz and gert are installed from source and needs this
52+
sudo apt-get install -y libharfbuzz-dev libfribidi-dev libgit2-dev
53+
54+
- name: Configure Git identity
55+
if: github.event_name == 'push'
56+
run: |
57+
env | sort
58+
git config --local user.name "$GITHUB_ACTOR"
59+
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
60+
shell: bash
61+
4362
# Begin custom: before install
4463
# End custom: before install
4564

@@ -56,42 +75,33 @@ jobs:
5675
shell: Rscript {0}
5776

5877
- name: Query dependencies
78+
if: runner.os != 'Windows'
5979
run: |
6080
saveRDS(remotes::dev_package_deps(dependencies = TRUE, type = .Platform$pkgType), ".github/depends.Rds", version = 2)
6181
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
6282
shell: Rscript {0}
6383

6484
- name: Restore R package cache
85+
if: runner.os != 'Windows'
6586
uses: actions/cache@v2
6687
with:
6788
path: ${{ env.R_LIBS_USER }}
6889
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
6990
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
7091

71-
- name: Configure Git identity
72-
if: github.event_name == 'push'
73-
run: |
74-
env | sort
75-
git config --local user.name "$GITHUB_ACTOR"
76-
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
77-
shell: bash
78-
7992
- name: Install system dependencies
8093
if: runner.os == 'Linux'
8194
run: |
82-
sudo apt-get update
8395
while read -r cmd
8496
do
8597
eval sudo $cmd
8698
done < <(Rscript -e 'req <- remotes::system_requirements("ubuntu", "18.04"); if (length(req) > 0) cat(req, sep = "\n")')
8799
88-
- name: Install pkgdown sysdeps
100+
- name: Add fake qpdf and checkbashisms
89101
if: runner.os == 'Linux'
90-
env:
91-
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
92102
run: |
93-
# For some reason harfbuzz and gert are installed from source and needs this
94-
sudo apt-get install -y libharfbuzz-dev libfribidi-dev libgit2-dev
103+
sudo ln -s $(which true) /usr/local/bin/qpdf
104+
sudo ln -s $(which true) /usr/local/bin/checkbashisms
95105
96106
- name: Install dependencies
97107
run: |
@@ -105,9 +115,6 @@ jobs:
105115
# Begin custom: install
106116
# End custom: install
107117

108-
- name: Install package
109-
run: R CMD INSTALL . --with-keep.source --with-keep.parse.data
110-
111118
- name: Session info
112119
run: |
113120
options(width = 100)
@@ -119,6 +126,9 @@ jobs:
119126
# Begin custom: after install
120127
# End custom: after install
121128

129+
- name: Install package
130+
run: R CMD INSTALL . --with-keep.source --with-keep.parse.data
131+
122132
- name: Deploy package
123133
if: github.event_name == 'push'
124134
run: |

‎.github/workflows/test-coverage.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
# Begin custom: services
1818
# End custom: services
1919
env:
20+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2021
RSPM: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"
2122
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2223
# prevent rgl issues because no X11 display is available
@@ -47,13 +48,15 @@ jobs:
4748
if (!requireNamespace("remotes", quietly = TRUE)) install.packages("remotes")
4849
shell: Rscript {0}
4950

50-
- name: Prepare cache keys
51+
- name: Query dependencies
52+
if: runner.os != 'Windows'
5153
run: |
5254
saveRDS(remotes::dev_package_deps(dependencies = TRUE, type = .Platform$pkgType), ".github/depends.Rds", version = 2)
5355
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
5456
shell: Rscript {0}
5557

5658
- name: Restore R package cache
59+
if: runner.os != 'Windows'
5760
uses: actions/cache@v2
5861
with:
5962
path: ${{ env.R_LIBS_USER }}
@@ -68,6 +71,12 @@ jobs:
6871
eval sudo $cmd
6972
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "18.04"))')
7073
74+
- name: Add fake qpdf and checkbashisms
75+
if: runner.os == 'Linux'
76+
run: |
77+
sudo ln -s $(which true) /usr/local/bin/qpdf
78+
sudo ln -s $(which true) /usr/local/bin/checkbashisms
79+
7180
- name: Install dependencies
7281
run: |
7382
remotes::install_deps(dependencies = TRUE, type = .Platform$pkgType)

0 commit comments

Comments
 (0)