eric sciple 5 жил өмнө
parent
commit
46054cf00b

+ 6 - 6
dist/index.js

@@ -5871,7 +5871,7 @@ function getSource(settings) {
                 yield git.lfsFetch(checkoutInfo.startPoint || checkoutInfo.ref);
                 yield git.lfsFetch(checkoutInfo.startPoint || checkoutInfo.ref);
             }
             }
             // Fix URL when using SSH
             // Fix URL when using SSH
-            if (settings.sshKey && initialRemoteUrl != sshUrl) {
+            if (settings.sshKey && initialRemoteUrl !== sshUrl) {
                 yield git.setRemoteUrl(sshUrl);
                 yield git.setRemoteUrl(sshUrl);
             }
             }
             // Checkout
             // Checkout
@@ -7207,12 +7207,12 @@ const fs = __importStar(__webpack_require__(747));
 const fsHelper = __importStar(__webpack_require__(618));
 const fsHelper = __importStar(__webpack_require__(618));
 const io = __importStar(__webpack_require__(1));
 const io = __importStar(__webpack_require__(1));
 const path = __importStar(__webpack_require__(622));
 const path = __importStar(__webpack_require__(622));
-function prepareExistingDirectory(git, repositoryPath, initialRemoteUrl, allowedRemoteUrls, clean) {
+function prepareExistingDirectory(git, repositoryPath, preferredRemoteUrl, allowedRemoteUrls, clean) {
     return __awaiter(this, void 0, void 0, function* () {
     return __awaiter(this, void 0, void 0, function* () {
         assert.ok(repositoryPath, 'Expected repositoryPath to be defined');
         assert.ok(repositoryPath, 'Expected repositoryPath to be defined');
+        assert.ok(preferredRemoteUrl, 'Expected preferredRemoteUrl to be defined');
         assert.ok(allowedRemoteUrls, 'Expected allowedRemoteUrls to be defined');
         assert.ok(allowedRemoteUrls, 'Expected allowedRemoteUrls to be defined');
         assert.ok(allowedRemoteUrls.length, 'Expected allowedRemoteUrls to have at least one value');
         assert.ok(allowedRemoteUrls.length, 'Expected allowedRemoteUrls to have at least one value');
-        assert.ok(initialRemoteUrl, 'Expected initialRemoteUrl to be defined');
         // Indicates whether to delete the directory contents
         // Indicates whether to delete the directory contents
         let remove = false;
         let remove = false;
         // The remote URL
         // The remote URL
@@ -7268,9 +7268,9 @@ function prepareExistingDirectory(git, repositoryPath, initialRemoteUrl, allowed
                         core.warning(`Unable to clean or reset the repository. The repository will be recreated instead.`);
                         core.warning(`Unable to clean or reset the repository. The repository will be recreated instead.`);
                     }
                     }
                 }
                 }
-                // Always fetch the workflow repository using HTTPS
-                if (remoteUrl !== initialRemoteUrl) {
-                    yield git.setRemoteUrl(initialRemoteUrl);
+                // Update to the preferred remote URL
+                if (remoteUrl !== preferredRemoteUrl) {
+                    yield git.setRemoteUrl(preferredRemoteUrl);
                 }
                 }
             }
             }
             catch (error) {
             catch (error) {

+ 4 - 1
src/git-directory-helper.ts

@@ -17,7 +17,10 @@ export async function prepareExistingDirectory(
   assert.ok(repositoryPath, 'Expected repositoryPath to be defined')
   assert.ok(repositoryPath, 'Expected repositoryPath to be defined')
   assert.ok(preferredRemoteUrl, 'Expected preferredRemoteUrl to be defined')
   assert.ok(preferredRemoteUrl, 'Expected preferredRemoteUrl to be defined')
   assert.ok(allowedRemoteUrls, 'Expected allowedRemoteUrls to be defined')
   assert.ok(allowedRemoteUrls, 'Expected allowedRemoteUrls to be defined')
-  assert.ok(allowedRemoteUrls.length, 'Expected allowedRemoteUrls to have at least one value')
+  assert.ok(
+    allowedRemoteUrls.length,
+    'Expected allowedRemoteUrls to have at least one value'
+  )
 
 
   // Indicates whether to delete the directory contents
   // Indicates whether to delete the directory contents
   let remove = false
   let remove = false

+ 1 - 1
src/git-source-provider.ts

@@ -130,7 +130,7 @@ export async function getSource(settings: IGitSourceSettings): Promise<void> {
     }
     }
 
 
     // Fix URL when using SSH
     // Fix URL when using SSH
-    if (settings.sshKey && initialRemoteUrl != sshUrl) {
+    if (settings.sshKey && initialRemoteUrl !== sshUrl) {
       await git.setRemoteUrl(sshUrl)
       await git.setRemoteUrl(sshUrl)
     }
     }