diff --git a/Jenkinsfile b/Jenkinsfile index 4c7f455c8c862..1c0aa8ab18433 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { } agent { label "android-ci" } environment { - GIT_CACHE_PATH = "${HOME}/cache" + // GIT_CACHE_PATH = "${HOME}/cache" QA_CODE = credentials("android-browser-qa-code") KEYSTORE_NAME = "linkbubble" KEYSTORE_PATH = credentials("android-browser-sign-key-store") @@ -161,9 +161,9 @@ pipeline { expression { !SKIP_IOS } } agent { label "mac-ci" } - environment { - GIT_CACHE_PATH = "${HOME}/cache" - } + // environment { + // GIT_CACHE_PATH = "${HOME}/cache" + // } stages { stage("checkout") { steps { @@ -256,9 +256,9 @@ pipeline { expression { !SKIP_LINUX } } agent { label "linux-ci" } - environment { - GIT_CACHE_PATH = "${HOME}/cache" - } + // environment { + // GIT_CACHE_PATH = "${HOME}/cache" + // } stages { stage("checkout") { steps { @@ -385,7 +385,7 @@ pipeline { } agent { label "mac-ci" } environment { - GIT_CACHE_PATH = "${HOME}/cache" + // GIT_CACHE_PATH = "${HOME}/cache" KEYCHAIN = "signing-ci" KEYCHAIN_PATH = "/Users/jenkins/Library/Keychains/${KEYCHAIN}.keychain-db" KEYCHAIN_PASS = credentials("mac-ci-signing-keychain-password") @@ -551,7 +551,7 @@ pipeline { } } environment { - GIT_CACHE_PATH = "C:\\Users\\Administrator\\cache" + // GIT_CACHE_PATH = "C:\\Users\\Administrator\\cache" PATH = "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x64\\;C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\IDE\\Remote Debugger\\x64;${PATH}" SIGNTOOL_ARGS = "sign /t http://timestamp.digicert.com /fd sha256 /sm" CERT = "Brave" @@ -913,8 +913,9 @@ def pinWindows() { } def install() { + // TODO(bsclifton): re-add below line to `sh` when git cache is sorted out + // rm -rf ${GIT_CACHE_PATH}/*.lock sh """ - rm -rf ${GIT_CACHE_PATH}/*.lock npm install --no-optional """ } @@ -977,8 +978,9 @@ def configWindows() { } def installWindows() { + // TODO(bsclifton): re-add below line to `powershell` when git cache is sorted out + // Remove-Item -Recurse -Force ${GIT_CACHE_PATH}/*.lock powershell """ - Remove-Item -Recurse -Force ${GIT_CACHE_PATH}/*.lock Get-ChildItem "Cert:\\LocalMachine\\My" | Remove-Item \$ErrorActionPreference = "Stop" npm install --no-optional