Read-only mirror — the public repositories of the Forgejo instance, refreshed every 10 minutes. The live instance (fg.dieschoenewolke.de) is reachable only over the VPN; clone here with https://git.dieschoenewolke.de/git/<owner>/<repo>.git.
summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authoreric sciple <ericsciple@users.noreply.github.com>2020-03-18 23:34:02 -0400
committereric sciple <ericsciple@users.noreply.github.com>2020-03-18 23:34:02 -0400
commitc740035296f5e758ddba55b13d486eceab434295 (patch)
treedb548c459d134e1616bff11af4627efa509907c5 /dist
parentd35c5b0d45c2389911e8fa57f5a409dc7eb4eba9 (diff)
.
Diffstat (limited to 'dist')
-rw-r--r--dist/index.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/dist/index.js b/dist/index.js
index 6e5f8f2..348e621 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -5871,7 +5871,7 @@ function getSource(settings) {
yield git.lfsFetch(checkoutInfo.startPoint || checkoutInfo.ref);
}
// Fix URL when using SSH
- if (settings.sshKey && initialRemoteUrl != sshUrl) {
+ if (settings.sshKey && initialRemoteUrl !== sshUrl) {
yield git.setRemoteUrl(sshUrl);
}
// Checkout
@@ -7207,12 +7207,12 @@ const fs = __importStar(__webpack_require__(747));
const fsHelper = __importStar(__webpack_require__(618));
const io = __importStar(__webpack_require__(1));
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* () {
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.length, 'Expected allowedRemoteUrls to have at least one value');
- assert.ok(initialRemoteUrl, 'Expected initialRemoteUrl to be defined');
// Indicates whether to delete the directory contents
let remove = false;
// 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.`);
}
}
- // 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) {