supply github login credentials on macos

rstudio · Apr 10, 2018 · 0009be1 · 0009be1
1 parent 1ed2037
commit 0009be1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Jenkinsfile.macos b/Jenkinsfile.macos
@@ -24,7 +24,9 @@ pipeline {
         PATH = '/usr/local/opt/openssl/bin:/usr/local/opt/openssl/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
       }
       steps {
-        sh 'cd dependencies/osx && ./install-dependencies-osx && cd ../..'
+        withCredentials([usernameColonPassword(credentialsId: 'github-rstudio-jenkins', variable: "GITHUB_LOGIN")]) {
+          sh 'cd dependencies/osx && RSTUDIO_GITHUB_LOGIN=$GITHUB_LOGIN ./install-dependencies-osx && cd ../..'
+        }
       }
     }
     stage('build'){

diff --git a/dependencies/common/install-packages b/dependencies/common/install-packages
@@ -30,7 +30,7 @@ PACKAGE_BUILD_OPTIONS=$3
 # git clone if necessary
 if [ ! -d "$PACKAGE_DIR" ]
 then
-  if [ -z "$RSTUDIO_GITHUB_LOGIN" ]; then
+  if [[ -z "$RSTUDIO_GITHUB_LOGIN" ]]; then
       # no supplied credentials, clone directly
       git clone "https://github.com/rstudio/$PACKAGE.git"
   else