Merge branch 'release/2.0.1'

sinoru · Aug 3, 2021 · 5b827dd · 5b827dd
2 parents 5b76718 + 72e3b62
commit 5b827dd
Show file tree

Hide file tree

Showing 7 changed files with 8,012 additions and 1,389 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,6 +27,4 @@ jobs:
           xcode-version: ${{ matrix.xcode-version }}
           apple-id: [email protected]
           apple-id-password: ${{ secrets.APPLE_ID_PASSWORD }}
-        env:
-          SPACESHIP_SKIP_2FA_UPGRADE: 1
       - run: xcodebuild -version
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/licenses.txt b/dist/licenses.txt
diff --git a/index.mjs b/index.mjs
@@ -25,12 +25,22 @@ async function installXcode(xcodeVersion, appleID, appleIDPassword) {
 
     core.startGroup('Install Xcode');
 
+    await exec.exec('xcversion', ['update'], {
+      cwd: process.env.TMPDIR,
+      env: {
+        ...process.env,
+        XCODE_INSTALL_USER: appleID,
+        XCODE_INSTALL_PASSWORD: appleIDPassword,
+        SPACESHIP_SKIP_2FA_UPGRADE: 1,
+      }
+    });
     await exec.exec('xcversion', ['install', xcodeVersion], {
       cwd: process.env.TMPDIR,
       env: {
         ...process.env,
         XCODE_INSTALL_USER: appleID,
-        XCODE_INSTALL_PASSWORD: appleIDPassword
+        XCODE_INSTALL_PASSWORD: appleIDPassword,
+        SPACESHIP_SKIP_2FA_UPGRADE: 1,
       }
     });