Use remotes::install_git
Change-Id: Iff15c6751e1bc50f1b21f125388fb18b9c8f290f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bc2559..1c58c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# use the verse rocker image, as it contains tidyverse, devtools and some texlive
+# use the verse rocker image, as it contains tidyverse, remotes and some texlive
image: rocker/tidyverse
# define stages of runner. at the moment,
@@ -23,35 +23,41 @@
- source `find .. -name section_helper.sh`
- start_section install_linux_packages "Installing missing Linux packages"
- apt-get update
- - apt-get install -y libvulkan1 libu2f-udev fonts-liberation build-essential libglpk40 libcurl4-gnutls-dev libxml2-dev libsodium-dev libsecret-1-dev libfontconfig1-dev libssl-dev libxt6 libpq-dev imagemagick libnss3 libgbm-dev libxss1 libappindicator3-1 libasound2 libatk-bridge2.0-0 libgtk-3-0 libnspr4 libnss3 libgbm-dev ca-certificates curl gnupg
- - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+ - apt-get install -y libvulkan1 libu2f-udev fonts-liberation build-essential
+ libglpk40 libcurl4-gnutls-dev libxml2-dev libsodium-dev libsecret-1-dev
+ libfontconfig1-dev libssl-dev libxt6 libpq-dev imagemagick libnss3
+ libgbm-dev libxss1 libappindicator3-1 libasound2 libatk-bridge2.0-0
+ libgtk-3-0 libnspr4 libnss3 libgbm-dev ca-certificates curl gnupg
+ - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key |
+ sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
- NODE_MAJOR=20
- - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg]
+ https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee
+ /etc/apt/sources.list.d/nodesource.list
- apt-get update && apt-get install nodejs -y
- node --version
- npm install puppeteer
- locale-gen de_DE.utf8 en_GB.utf8 en_US.utf8
- end_section install_linux_packages
-
- start_section setup_deployment "Setup deployment"
- - 'command -v ssh-agent >/dev/null || apt-get install openssh-client -y'
+ - "command -v ssh-agent >/dev/null || apt-get install openssh-client -y"
- ##
- ## Run ssh-agent (inside the build environment)
- ##
+ ##
+ ## Run ssh-agent (inside the build environment)
+ ##
- eval $(ssh-agent -s)
- ##
- ## Give the right permissions, otherwise ssh-add will refuse to add files
- ## Add the SSH key stored in SSH_PRIVATE_KEY file type CI/CD variable to the agent store
- ##
+ ##
+ ## Give the right permissions, otherwise ssh-add will refuse to add files
+ ## Add the SSH key stored in SSH_PRIVATE_KEY file type CI/CD variable to the agent store
+ ##
- chmod 400 "$SSH_PRIVATE_KEY"
- ssh-add "$SSH_PRIVATE_KEY"
- ##
- ## Create the SSH directory and give it the right permissions
- ##
+ ##
+ ## Create the SSH directory and give it the right permissions
+ ##
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- end_section setup_deployment
@@ -61,18 +67,25 @@
- end_section test_puppeteer
- start_section install_r_packages "Installing missing R packages"
- - R -e "install.packages(c('devtools', 'RKorAPClient', 'httr', 'tidytext', 'httpuv', 'scales', 'sp', 'raster', 'kableExtra', 'DT', 'svglite', 'qrcode', 'rsvg', 'highcharter'))"
- - R -e 'devtools::install_git("https://korap.ids-mannheim.de/gerrit/IDS-Mannheim/idsThemeR")'
+ - R -e "install.packages(c('devtools', 'remotes', 'RKorAPClient', 'httr',
+ 'tidytext', 'httpuv', 'scales', 'sp', 'raster', 'kableExtra', 'DT',
+ 'svglite', 'qrcode', 'rsvg', 'highcharter'))"
+ - R -e
+ 'remotes::install_git("https://korap.ids-mannheim.de/gerrit/IDS-Mannheim/idsThemeR")'
- R -e 'devtools::install(".")'
- end_section install_r_packages
script:
- start_section render "Running scripts"
- - R_CACHE_ROOTPATH=./cache R -e "require(rmarkdown); render('examples/ids.Rmd', output_format='revealjs::revealjs_presentation', output_dir='target')"
+ - R_CACHE_ROOTPATH=./cache R -e "require(rmarkdown);
+ render('examples/ids.Rmd',
+ output_format='revealjs::revealjs_presentation', output_dir='target')"
- ./ci/screenshot file://`pwd`/target/ids.html target/title.png
- file://`pwd`/target/ids.html#/light-verb-constructions target/lvc.png
- file://`pwd`/target/ids.html#/registered-users target/users.png
- file://`pwd`/target/ids.html#/references-1 target/references.png
+ file://`pwd`/target/ids.html#/light-verb-constructions target/lvc.png
+ file://`pwd`/target/ids.html#/registered-users target/users.png
+ file://`pwd`/target/ids.html#/references-1 target/references.png
- end_section render
- start_section deploy "Deploying slides"
- - scp -ro StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null target/ids* cowner@klinux10:/vol/work/kupietz/slides/2023-10-08-Revealjs-demo/
+ - scp -ro StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
+ target/ids*
+ cowner@klinux10:/vol/work/kupietz/slides/2023-10-08-Revealjs-demo/
diff --git a/README.Rmd b/README.Rmd
index 3efbb59..40d2e63 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -27,7 +27,7 @@
You can use this format in R Markdown documents by installing this package as follows:
``` r
-devtools::install_git("https://korap.ids-mannheim.de/gerrit/IDS-Mannheim/revealjs")
+remotes::install_git("https://korap.ids-mannheim.de/gerrit/IDS-Mannheim/revealjs")
```
To create a [reveal.js](https://revealjs.com/) presentation from R Markdown you specify the `revealjs_presentation` output format in the front-matter of your document. You can create a slide show broken up into sections by using the `#` and `##` heading tags (you can also create a new slide without a header using a horizontal rule (`----`). For example here's a simple slide show: