Fix for fastlane update and npm install

ghostery · Sep 25, 2018 · ba1ea4519abb222fea8c4ddcdb1c440ff8ee3d41 · ba1ea45
1 parent 0b9f37f
commit ba1ea4519abb222fea8c4ddcdb1c440ff8ee3d41
Unified Split

Showing with 4 additions and 2 deletions.

+1 −0 Jenkinsfile.nightly

+1 −0 Jenkinsfile.publish

+2 −2 fastlane/Fastfile
diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly
@@ -69,6 +69,7 @@ node('mac-vm-host') {
                         xcodebuild -version
                         pkgutil --pkg-info=com.apple.pkg.CLTools_Executables
                         sudo xcodebuild -license accept
+                        gem install fastlane --no-document
                         fastlane clearCache
                         fastlane prepare
                         pip install virtualenv

diff --git a/Jenkinsfile.publish b/Jenkinsfile.publish
@@ -67,6 +67,7 @@ node('mac-vm-host') {
                         xcodebuild -version
                         pkgutil --pkg-info=com.apple.pkg.CLTools_Executables
                         sudo xcodebuild -license accept
+                        gem install fastlane --no-document
                         fastlane clearCache
                         fastlane prepare
                         pip install virtualenv

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -7,7 +7,7 @@
 #
 
 # Uncomment the line if you want fastlane to automatically update itself
-update_fastlane
+# update_fastlane
 
 default_platform(:ios)
 
@@ -49,7 +49,7 @@ platform :ios do
   lane :clearCache do
 
     # Remove the Cache
-    sh("cd .. && rm -rf Cartfile.resolved Carthage node_modules Podfile.lock Pods && rm -rf ~/Library/Caches/org.carthage.CarthageKit")
+    sh("cd .. && npm cache clean --force && rm -rf Cartfile.resolved Carthage node_modules Podfile.lock Pods && rm -rf ~/Library/Caches/org.carthage.CarthageKit")
 
   end