From 2bcd7c6585690a2dd416c53b94b33565113e7081 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Wed, 15 Oct 2025 15:38:31 +0000 Subject: [PATCH] . --- .github/workflows/test.yml | 4 ---- dist/index.js | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 974e9a7..daeacc9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -328,7 +328,3 @@ jobs: echo "Expected commit to be 82f71901cf8c021332310dcc8cdba84c4193ff5d" exit 1 fi - - # # needed to make checkout post cleanup succeed - # - name: Fix Checkout - # uses: actions/checkout@v4.1.6 diff --git a/dist/index.js b/dist/index.js index 55e003a..7c0a591 100644 --- a/dist/index.js +++ b/dist/index.js @@ -289,15 +289,15 @@ class GitAuthHelper { // For each submodule, configure includeIf entries pointing to the shared credentials file. // Configure both host and container paths to support Docker container actions. for (const configPath of configPaths) { - // The config file is at .git/modules/submodule-name/config - let submoduleConfigDir = path.dirname(configPath); - submoduleConfigDir = submoduleConfigDir.replace(/\\/g, '/'); // Use forward slashes, even on Windows + // Submodule Git directory + let submoduleGitDir = path.dirname(configPath); // The config file is at .git/modules/submodule-name/config + submoduleGitDir = submoduleGitDir.replace(/\\/g, '/'); // Use forward slashes, even on Windows // Configure host includeIf - yield this.git.config(`includeIf.gitdir:${submoduleConfigDir}.path`, credentialsConfigPath, false, false, configPath); + yield this.git.config(`includeIf.gitdir:${submoduleGitDir}.path`, credentialsConfigPath, false, false, configPath); // Configure container includeIf - let relativeSubmoduleConfigDir = path.relative(githubWorkspace, submoduleConfigDir); - relativeSubmoduleConfigDir = relativeSubmoduleConfigDir.replace(/\\/g, '/'); // Use forward slashes, even on Windows - const containerSubmoduleGitDir = path.posix.join('/github/workspace', relativeSubmoduleConfigDir); + let relativeSubmoduleGitDir = path.relative(githubWorkspace, submoduleGitDir); + relativeSubmoduleGitDir = relativeSubmoduleGitDir.replace(/\\/g, '/'); // Use forward slashes, even on Windows + const containerSubmoduleGitDir = path.posix.join('/github/workspace', relativeSubmoduleGitDir); yield this.git.config(`includeIf.gitdir:${containerSubmoduleGitDir}.path`, containerCredentialsPath, false, false, configPath); } if (this.settings.sshKey) {