Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to new version of learnr/shiny #105

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions Jenkinsfile.library
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!groovy

doUpload = (env.BRANCH_NAME == 'master')

ansiColor('xterm') {
node('docker') {
stage('setup') {
Expand All @@ -27,20 +25,16 @@ ansiColor('xterm') {
}

stage('Upload') {
if (doUpload) {
image.inside() {
gitSHA = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
unstash 'rlibrary'
withCredentials([string(credentialsId: 'primers-role-name', variable: 'PRIMERS_ROLE_NAME')]) {
withCredentials([string(credentialsId: 'primers-role-account', variable: 'PRIMERS_ROLE_ACCOUNT')]) {
withAWS(role: PRIMERS_ROLE_NAME, roleAccount: PRIMERS_ROLE_ACCOUNT) {
sh "aws s3 cp bionic-r3-6-3.tar.gz s3://primers-library/r3.6.3/bionic/${gitSHA}.tar.gz"
}
image.inside() {
gitSHA = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
unstash 'rlibrary'
withCredentials([string(credentialsId: 'primers-role-name', variable: 'PRIMERS_ROLE_NAME')]) {
withCredentials([string(credentialsId: 'primers-role-account', variable: 'PRIMERS_ROLE_ACCOUNT')]) {
withAWS(role: PRIMERS_ROLE_NAME, roleAccount: PRIMERS_ROLE_ACCOUNT) {
sh "aws s3 cp bionic-r3-6-3.tar.gz s3://primers-library/r3.6.3/bionic/${gitSHA}.tar.gz"
}
}
}
} else {
print "Skipping"
}
}
stage('Finish') {
Expand Down
17 changes: 12 additions & 5 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@
"Repository": "CRAN",
"Hash": "6b436e95723d1f0e861224dd9b094dfb"
},
"commonmark": {
"Package": "commonmark",
"Version": "1.7",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "0f22be39ec1d141fd03683c06f3a6e67"
},
"crayon": {
"Package": "crayon",
"Version": "1.3.4",
Expand Down Expand Up @@ -523,15 +530,15 @@
},
"learnr": {
"Package": "learnr",
"Version": "0.10.1.9002",
"Version": "0.10.1.9006",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "rstudio",
"RemoteRepo": "learnr",
"RemoteRef": "master",
"RemoteSha": "cf5fe34eaee039986596e1578bac0d5ffdb01d06",
"Hash": "800d562c082bbb8914ee5ed88e3cec82"
"RemoteSha": "1f34b450ebf61a2c1c5c2742d1fa14ed0b00f0f4",
"Hash": "0bd2becae4659a83c540337319838266"
},
"lifecycle": {
"Package": "lifecycle",
Expand Down Expand Up @@ -899,10 +906,10 @@
},
"shiny": {
"Package": "shiny",
"Version": "1.4.0.2",
"Version": "1.5.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "a56d058adfc9df30bdd45dbb01cec39f"
"Hash": "ee4ed72d7a5047d9e73cf922ad66e9c9"
},
"sourcetools": {
"Package": "sourcetools",
Expand Down
14 changes: 14 additions & 0 deletions visualize-data/01-bar-charts/01-bar-charts.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,20 @@ tryCatch(
)
```

```{r, context="server", include=FALSE}
tryCatch({
cat("Observed a new session:", getDefaultReactiveDomain()$token, "\n")
getDefaultReactiveDomain()$onSessionEnded(function(){
cat("Observed session end:", getDefaultReactiveDomain()$token, "\n")
})
},
error = function(e){
print("An error occurred printing information about the session")
print(e)
}
)
```

## Welcome

This tutorial will show you how to make and enhance **bar charts** with the ggplot2 package. You will learn how to:
Expand Down