read the GitHub server URL from the 'GITHUB_SERVER_URL' env variable (#…

…835) Signed-off-by: Christian Rauch <Christian.Rauch@de.bosch.com>
ros-tooling · Nov 9, 2023 · 67b4ac4 · 67b4ac4
1 parent 38c12d5
commit 67b4ac4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11554,12 +11554,13 @@ done`;
         // if ref is set this overrides anything calculated above
         commitRef = core.getInput("ref") || commitRef;
         const repoFilePath = path.join(rosWorkspaceDir, "package.repo");
+        const githubServerUrl = process.env.GITHUB_SERVER_URL;
         // Add a random string prefix to avoid naming collisions when checking out the test repository
         const randomStringPrefix = Math.random().toString(36).substring(2, 15);
         const repoFileContent = `repositories:
   ${randomStringPrefix}/${repo["repo"]}:
     type: git
-    url: 'https://github.com/${repoFullName}.git'
+    url: '${githubServerUrl}/${repoFullName}.git'
     version: '${commitRef}'`;
         fs_1.default.writeFileSync(repoFilePath, repoFileContent);
         yield execShellCommand(["vcs import --force --recursive src/ < package.repo"], options);

diff --git a/src/action-ros-ci.ts b/src/action-ros-ci.ts
@@ -563,12 +563,13 @@ done`;
 	// if ref is set this overrides anything calculated above
 	commitRef = core.getInput("ref") || commitRef;
 	const repoFilePath = path.join(rosWorkspaceDir, "package.repo");
+	const githubServerUrl = process.env.GITHUB_SERVER_URL as string;
 	// Add a random string prefix to avoid naming collisions when checking out the test repository
 	const randomStringPrefix = Math.random().toString(36).substring(2, 15);
 	const repoFileContent = `repositories:
   ${randomStringPrefix}/${repo["repo"]}:
     type: git
-    url: 'https://github.com/${repoFullName}.git'
+    url: '${githubServerUrl}/${repoFullName}.git'
     version: '${commitRef}'`;
 	fs.writeFileSync(repoFilePath, repoFileContent);
 	await execShellCommand(