fix(fastlane): Small fixes in CircleCI generator, clarify some questi…

…ons in fastlane-env
bamlab · Apr 20, 2019 · c6bb68d · c6bb68d
1 parent c5b3b9f
commit c6bb68d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/generators/circleci/templates/config.yml b/generators/circleci/templates/config.yml
@@ -52,7 +52,7 @@ jobs:
           key: bundle-v1-{{ checksum "<%= prefixRN('Gemfile.lock') %>" }}-{{ arch }}
           paths:
             - ~/.bundle/
-            - vendor/bundle
+            - <%= prefixRN('vendor/bundle') %>
 
       - save_cache:
           key: yarn-v1-{{ checksum "<%= prefixRN('yarn.lock') %>" }}-{{ arch }}
@@ -68,7 +68,7 @@ jobs:
           root: ~/<%= projectName %>
           paths:
             - <%= prefixRN('node_modules') %>
-            - vendor/bundle
+            - <%= prefixRN('vendor/bundle') %>
 
       - store_test_results:
           path: <%= prefixRN('test-results') %>
@@ -176,7 +176,7 @@ jobs:
           paths:
             - ~/.bundle/
             - /Users/distiller/.gem/ruby/2.4.5/
-            - vendor/bundle
+            - <%= prefixRN('vendor/bundle') %>
 
       - deploy:
           name: Match, Build, Sign & Deploy

diff --git a/generators/fastlane-env/index.js b/generators/fastlane-env/index.js
@@ -125,14 +125,22 @@ class FastlaneEnvGenerator extends Base {
       {
         type: 'input',
         name: 'itunesTeamName',
-        message: 'The itunesconnect.apple.com team name',
+        message: 'The appstoreconnect.apple.com team name',
         default: 'MyCompany',
         when: answers => answers.deploymentPlatform === 'appstore',
       },
+      {
+        type: 'input',
+        name: 'appstoreConnectAppleId',
+        message:
+          'An AppstoreConnect Apple Id (good practice: ID should have "developer" access - only allowed to upload builds). Can be entered later in fastlane/env.<environment>',
+        when: answers => answers.deploymentPlatform === 'appstore',
+      },
       {
         type: 'input',
         name: 'appleId',
-        message: 'Your apple id',
+        message:
+          'Your apple id (should be admin on the Apple Developer Portal)',
         default: 'dev@mycompany.com',
       },
       {
@@ -152,13 +160,6 @@ class FastlaneEnvGenerator extends Base {
         when: answers => answers.deploymentPlatform === 'hockeyapp',
       },
 
-      {
-        type: 'input',
-        name: 'appstoreConnectAppleId',
-        message:
-          'An AppstoreConnect Apple Id (make sure the ID has "developer" acces - only allowed to upload builds). Can be entered later in fastlane/env.<environment>',
-        when: answers => answers.deploymentPlatform === 'appstore',
-      },
       {
         type: 'input',
         name: 'androidPlayStoreJsonKeyPath',