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'
@@ -257,7 +268,7 @@ jobs:
           path: basic
       - name: Verify basic
         run: __test__/verify-basic.sh --archive
-    
+
   test-git-container:
     runs-on: ubuntu-latest
     container: bitnami/git:latest

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

@@ -1,100 +1,109 @@
-name: 'Checkout'
+name: 'Checkout'
-description: 'Checkout a Git repository at a particular version'
+description: 'Checkout a Git repository at a particular version'
-inputs:
+inputs:
-  repository:
+  repository:
-    description: 'Repository name with owner. For example, actions/checkout'
+    description: 'Repository name with owner. For example, actions/checkout'
-    default: ${{ github.repository }}
+    default: ${{ github.repository }}
-  ref:
+  ref:
-    description: >
+    description: >
-      The branch, tag or SHA to checkout. When checking out the repository that
+      The branch, tag or SHA to checkout. When checking out the repository that
-      triggered a workflow, this defaults to the reference or SHA for that
+      triggered a workflow, this defaults to the reference or SHA for that
-      event.  Otherwise, uses the default branch.
+      event.  Otherwise, uses the default branch.
-  token:
+  token:
-    description: >
+    description: >
-      Personal access token (PAT) used to fetch the repository. The PAT is configured
+      Personal access token (PAT) used to fetch the repository. The PAT is configured
-      with the local git config, which enables your scripts to run authenticated git
+      with the local git config, which enables your scripts to run authenticated git
-      commands. The post-job step removes the PAT.
+      commands. The post-job step removes the PAT.
-
+
-
+
-      We recommend using a service account with the least permissions necessary.
+      We recommend using a service account with the least permissions necessary.
-      Also when generating a new PAT, select the least scopes necessary.
+      Also when generating a new PAT, select the least scopes necessary.
-
+
-
+
-      [Learn more about creating and using encrypted secrets](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
+      [Learn more about creating and using encrypted secrets](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
-    default: ${{ github.token }}
+    default: ${{ github.token }}
-  ssh-key:
+  ssh-key:
-    description: >
+    description: >
-      SSH key used to fetch the repository. The SSH key is configured with the local
+      SSH key used to fetch the repository. The SSH key is configured with the local
-      git config, which enables your scripts to run authenticated git commands.
+      git config, which enables your scripts to run authenticated git commands.
-      The post-job step removes the SSH key.
+      The post-job step removes the SSH key.
-
+
-
+
-      We recommend using a service account with the least permissions necessary.
+      We recommend using a service account with the least permissions necessary.
-
+
-
+
-      [Learn more about creating and using
+      [Learn more about creating and using
-      encrypted secrets](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
+      encrypted secrets](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
-  ssh-known-hosts:
+  ssh-known-hosts:
-    description: >
+    description: >
-      Known hosts in addition to the user and global host key database. The public
+      Known hosts in addition to the user and global host key database. The public
-      SSH keys for a host may be obtained using the utility `ssh-keyscan`. For example,
+      SSH keys for a host may be obtained using the utility `ssh-keyscan`. For example,
-      `ssh-keyscan github.com`. The public key for github.com is always implicitly added.
+      `ssh-keyscan github.com`. The public key for github.com is always implicitly added.
-  ssh-strict:
+  ssh-strict:
-    description: >
+    description: >
-      Whether to perform strict host key checking. When true, adds the options `StrictHostKeyChecking=yes`
+      Whether to perform strict host key checking. When true, adds the options `StrictHostKeyChecking=yes`
-      and `CheckHostIP=no` to the SSH command line. Use the input `ssh-known-hosts` to
+      and `CheckHostIP=no` to the SSH command line. Use the input `ssh-known-hosts` to
-      configure additional hosts.
+      configure additional hosts.
-    default: true
+    default: true
-  persist-credentials:
+  persist-credentials:
-    description: 'Whether to configure the token or SSH key with the local git config'
+    description: 'Whether to configure the token or SSH key with the local git config'
-    default: true
+    default: true
-  path:
+  path:
-    description: 'Relative path under $GITHUB_WORKSPACE to place the repository'
+    description: 'Relative path under $GITHUB_WORKSPACE to place the repository'
-  clean:
+  clean:
-    description: 'Whether to execute `git clean -ffdx && git reset --hard HEAD` before fetching'
+    description: 'Whether to execute `git clean -ffdx && git reset --hard HEAD` before fetching'
-    default: true
+    default: true
-  filter:
+  filter:
-    description: >
+    description: >
-      Partially clone against a given filter.
+      Partially clone against a given filter.
-      Overrides sparse-checkout if set.
+      Overrides sparse-checkout if set.
-    default: null
+    default: null
-  sparse-checkout:
+  sparse-checkout:
-    description: >
+    description: >
-      Do a sparse checkout on given patterns.
+      Do a sparse checkout on given patterns.
-      Each pattern should be separated with new lines.
+      Each pattern should be separated with new lines.
-    default: null
+    default: null
-  sparse-checkout-cone-mode:
+  sparse-checkout-cone-mode:
-    description: >
+    description: >
-      Specifies whether to use cone-mode when doing a sparse checkout.
+      Specifies whether to use cone-mode when doing a sparse checkout.
-    default: true
+    default: true
-  fetch-depth:
+  fetch-depth:
-    description: 'Number of commits to fetch. 0 indicates all history for all branches and tags.'
+    description: 'Number of commits to fetch. 0 indicates all history for all branches and tags.'
-    default: 1
+    default: 1
-  fetch-tags:
+  fetch-tags:
-    description: 'Whether to fetch tags, even if fetch-depth > 0.'
+    description: 'Whether to fetch tags, even if fetch-depth > 0.'
-    default: false
+    default: false
-  show-progress:
+  fetch-parallel:
-    description: 'Whether to show progress status output when fetching.'
+    description: >
-    default: true
+      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).
-  lfs:
+      A value of 0 will give some reasonable default. If unset, it defaults to 1.
-    description: 'Whether to download Git-LFS files'
+    default: 1
-    default: false
+  show-progress:
-  submodules:
+    description: 'Whether to show progress status output when fetching.'
-    description: >
+    default: true
-      Whether to checkout submodules: `true` to checkout submodules or `recursive` to
+  lfs:
-      recursively checkout submodules.
+    description: 'Whether to download Git-LFS files'
-
+    default: false
-
+  submodules:
-      When the `ssh-key` input is not provided, SSH URLs beginning with `git@github.com:` are
+    description: >
-      converted to HTTPS.
+      Whether to checkout submodules: `true` to checkout submodules or `recursive` to
-    default: false
+      recursively checkout submodules.
-  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
+      When the `ssh-key` input is not provided, SSH URLs beginning with `git@github.com:` are
-  github-server-url:
+      converted to HTTPS.
-    description: The base URL for the GitHub instance that you are trying to clone from, will use environment defaults to fetch from the same instance that the workflow is running from unless specified. Example URLs are https://github.com or https://my-ghes-server.example.com
+    default: false
-    required: false
+  submodules-fetch-jobs:
-runs:
+    description: >
-  using: node20
+      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.
-  main: dist/index.js
+    default: 1
-  post: dist/index.js
+  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
+  github-server-url:
+    description: The base URL for the GitHub instance that you are trying to clone from, will use environment defaults to fetch from the same instance that the workflow is running from unless specified. Example URLs are https://github.com or https://my-ghes-server.example.com
+    required: false
+runs:
+  using: node20
+  main: dist/index.js
+  post: dist/index.js

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')