Merge 4475b1ceed into cd7d8d697e

.github/workflows/test.yml

@@ -165,6 +165,17 @@ jobs:
       - name: Verify submodules recursive
         run: __test__/verify-submodules-recursive.sh
 
+      # Submodules fetchJobs
+      - name: Checkout submodules true
+        uses: ./
+        with:
+          ref: test-data/v2/submodule-ssh-url
+          path: submodules-true
+          submodules: recursive
+          submodules-fetch-jobs: "10"
+      - name: Verify submodules true
+        run: __test__/verify-submodules-with-jobs.sh
+
       # Basic checkout using REST API
       - name: Remove basic
         if: runner.os != 'windows'

README.md

@@ -94,6 +94,12 @@ Please refer to the [release page](https://github.com/actions/checkout/releases/
     # Default: false
     fetch-tags: ''
 
+    # Specifies the maximal number of fetch operations to be run in parallel at a time
+    # (submodules, or remotes when the --multiple option of git-fetch is in effect). A
+    # value of 0 will give some reasonable default. If unset, it defaults to 1.
+    # Default: 1
+    fetch-parallel: ''
+
     # Whether to show progress status output when fetching.
     # Default: true
     show-progress: ''
@@ -111,6 +117,12 @@ Please refer to the [release page](https://github.com/actions/checkout/releases/
     # Default: false
     submodules: ''
 
+    # Specifies how many submodules are fetched/cloned at the same time. A positive
+    # integer allows up to that number of submodules fetched in parallel. A value of 0
+    # will give some reasonable default. If unset, it defaults to 1.
+    # Default: 1
+    submodules-fetch-jobs: ''
+
     # Add repository path as safe.directory for Git global config by running `git
     # config --global --add safe.directory <path>`
     # Default: true

__test__/git-auth-helper.test.ts

@@ -809,10 +809,12 @@ async function setup(testName: string): Promise<void> {
     sparseCheckoutConeMode: true,
     fetchDepth: 1,
     fetchTags: false,
+    fetchParallel: 1,
     showProgress: true,
     lfs: false,
     submodules: false,
     nestedSubmodules: false,
+    submodulesFetchJobs: 1,
     persistCredentials: true,
     ref: 'refs/heads/main',
     repositoryName: 'my-repo',

__test__/verify-submodules-with-jobs.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [ ! -f "./submodules-recursive/regular-file.txt" ]; then
+    echo "Expected regular file does not exist"
+    exit 1
+fi
+
+if [ ! -f "./submodules-recursive/submodule-level-1/submodule-file.txt" ]; then
+    echo "Expected submodule file does not exist"
+    exit 1
+fi
+
+if [ ! -f "./submodules-recursive/submodule-level-1/submodule-level-2/nested-submodule-file.txt" ]; then
+    echo "Expected nested submodule file does not exists"
+    exit 1
+fi
+
+echo "Testing fetchJobs exists"
+git config --local --get-regexp submodules.fetchJobs | grep 10
+if [ "$?" != "0" ]; then
+    echo "Failed to validate fetchJobs configuration"
+    exit 1
+fi
+
+echo "Testing persisted credential"
+pushd ./submodules-recursive/submodule-level-1/submodule-level-2
+git config --local --name-only --get-regexp http.+extraheader && git fetch
+if [ "$?" != "0" ]; then
+    echo "Failed to validate persisted credential"
+    popd
+    exit 1
+fi
+popd

action.yml

@@ -73,6 +73,11 @@ inputs:
   fetch-tags:
     description: 'Whether to fetch tags, even if fetch-depth > 0.'
     default: false
+  fetch-parallel:
+    description: >
+      Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the --multiple option of git-fetch is in effect).
+      A value of 0 will give some reasonable default. If unset, it defaults to 1.
+    default: 1
   show-progress:
     description: 'Whether to show progress status output when fetching.'
     default: true
@@ -88,6 +93,10 @@ inputs:
       When the `ssh-key` input is not provided, SSH URLs beginning with `git@github.com:` are
       converted to HTTPS.
     default: false
+  submodules-fetch-jobs:
+    description: >
+      Specifies how many submodules are fetched/cloned at the same time. A positive integer allows up to that number of submodules fetched in parallel. A value of 0 will give some reasonable default. If unset, it defaults to 1.
+    default: 1
   set-safe-directory:
     description: Add repository path as safe.directory for Git global config by running `git config --global --add safe.directory <path>`
     default: true

dist/index.js

@@ -1255,6 +1255,7 @@ function getSource(settings) {
             }
             // Fetch
             core.startGroup('Fetching the repository');
+            yield git.config('fetch.parallel', settings.fetchParallel.toString(), true);
             const fetchOptions = {};
             if (settings.filter) {
                 fetchOptions.filter = settings.filter;
@@ -1323,6 +1324,7 @@ function getSource(settings) {
                 core.endGroup();
                 // Checkout submodules
                 core.startGroup('Fetching submodules');
+                yield git.config('submodule.fetchJobs', settings.submodulesFetchJobs.toString(), true);
                 yield git.submoduleSync(settings.nestedSubmodules);
                 yield git.submoduleUpdate(settings.fetchDepth, settings.nestedSubmodules);
                 yield git.submoduleForeach('git config --local gc.auto 0', settings.nestedSubmodules);
@@ -1771,6 +1773,12 @@ function getInputs() {
         result.fetchTags =
             (core.getInput('fetch-tags') || 'false').toUpperCase() === 'TRUE';
         core.debug(`fetch tags = ${result.fetchTags}`);
+        // Fetch tags
+        result.fetchParallel = Math.floor(Number(core.getInput('fetch-parallel') || '1'));
+        if (isNaN(result.fetchParallel) || result.fetchParallel < 0) {
+            result.fetchParallel = 0;
+        }
+        core.debug(`fetch parallel = ${result.fetchParallel}`);
         // Show fetch progress
         result.showProgress =
             (core.getInput('show-progress') || 'true').toUpperCase() === 'TRUE';
@@ -1789,10 +1797,17 @@ function getInputs() {
         else if (submodulesString == 'TRUE') {
             result.submodules = true;
         }
+        result.submodulesFetchJobs = Math.floor(Number(core.getInput('submodules-fetch-jobs') || '1'));
+        if (isNaN(result.submodulesFetchJobs) || result.submodulesFetchJobs < 0) {
+            result.submodulesFetchJobs = 0;
+        }
         core.debug(`submodules = ${result.submodules}`);
         core.debug(`recursive submodules = ${result.nestedSubmodules}`);
+        core.debug(`submodules submodules-fetch-jobs = ${result.submodulesFetchJobs}`);
         // Auth token
-        result.authToken = core.getInput('token', { required: true });
+        result.authToken = core.getInput('token', {
+            required: true
+        });
         // SSH
         result.sshKey = core.getInput('ssh-key');
         result.sshKnownHosts = core.getInput('ssh-known-hosts');

src/git-source-provider.ts

@@ -156,6 +156,7 @@ export async function getSource(settings: IGitSourceSettings): Promise<void> {
 
     // Fetch
     core.startGroup('Fetching the repository')
+    await git.config('fetch.parallel', settings.fetchParallel.toString(), true)
     const fetchOptions: {
       filter?: string
       fetchDepth?: number
@@ -241,6 +242,11 @@ export async function getSource(settings: IGitSourceSettings): Promise<void> {
 
       // Checkout submodules
       core.startGroup('Fetching submodules')
+      await git.config(
+        'submodule.fetchJobs',
+        settings.submodulesFetchJobs.toString(),
+        true
+      )
       await git.submoduleSync(settings.nestedSubmodules)
       await git.submoduleUpdate(settings.fetchDepth, settings.nestedSubmodules)
       await git.submoduleForeach(

src/git-source-settings.ts

@@ -54,6 +54,11 @@ export interface IGitSourceSettings {
    */
   fetchTags: boolean
 
+  /**
+   * Indicates the maximal number of fetch operations to be run in parallel at a time
+   */
+  fetchParallel: number
+
   /**
    * Indicates whether to use the --progress option when fetching
    */
@@ -74,6 +79,11 @@ export interface IGitSourceSettings {
    */
   nestedSubmodules: boolean
 
+  /**
+   * Indicates the number of parallel jobs to use when fetching submodules
+   */
+  submodulesFetchJobs: number
+
   /**
    * The auth token to use when fetching the repository
    */

src/input-helper.ts

@@ -113,6 +113,15 @@ export async function getInputs(): Promise<IGitSourceSettings> {
     (core.getInput('fetch-tags') || 'false').toUpperCase() === 'TRUE'
   core.debug(`fetch tags = ${result.fetchTags}`)
 
+  // Fetch tags
+  result.fetchParallel = Math.floor(
+    Number(core.getInput('fetch-parallel') || '1')
+  )
+  if (isNaN(result.fetchParallel) || result.fetchParallel < 0) {
+    result.fetchParallel = 0
+  }
+  core.debug(`fetch parallel = ${result.fetchParallel}`)
+
   // Show fetch progress
   result.showProgress =
     (core.getInput('show-progress') || 'true').toUpperCase() === 'TRUE'
@@ -132,11 +141,20 @@ export async function getInputs(): Promise<IGitSourceSettings> {
   } else if (submodulesString == 'TRUE') {
     result.submodules = true
   }
+  result.submodulesFetchJobs = Math.floor(
+    Number(core.getInput('submodules-fetch-jobs') || '1')
+  )
+  if (isNaN(result.submodulesFetchJobs) || result.submodulesFetchJobs < 0) {
+    result.submodulesFetchJobs = 0
+  }
   core.debug(`submodules = ${result.submodules}`)
   core.debug(`recursive submodules = ${result.nestedSubmodules}`)
+  core.debug(`submodules submodules-fetch-jobs = ${result.submodulesFetchJobs}`)
 
   // Auth token
-  result.authToken = core.getInput('token', {required: true})
+  result.authToken = core.getInput('token', {
+    required: true
+  })
 
   // SSH
   result.sshKey = core.getInput('ssh-key')