From efa851d6746a5c2f4950ff547b1da468d90151bd Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Mon, 11 Oct 2021 20:01:46 +0200
Subject: [PATCH] Fix checkout behavior and FileVersion

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Upstream-commit: dbac826815defc29fbf322e046656d9241313c6b
Component: cli
---
 components/cli/.github/workflows/build.yml    | 2 ++
 components/cli/.github/workflows/validate.yml | 2 ++
 components/cli/scripts/build/mkversioninfo    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/cli/.github/workflows/build.yml b/components/cli/.github/workflows/build.yml
index a2f6278d04a..0807d5d839b 100644
--- a/components/cli/.github/workflows/build.yml
+++ b/components/cli/.github/workflows/build.yml
@@ -23,6 +23,8 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
diff --git a/components/cli/.github/workflows/validate.yml b/components/cli/.github/workflows/validate.yml
index 3a38110c7ff..cd1c920e517 100644
--- a/components/cli/.github/workflows/validate.yml
+++ b/components/cli/.github/workflows/validate.yml
@@ -23,6 +23,8 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       -
         name: Run
         uses: docker/bake-action@v1
diff --git a/components/cli/scripts/build/mkversioninfo b/components/cli/scripts/build/mkversioninfo
index e1d89fc7662..13fd2d10bb4 100755
--- a/components/cli/scripts/build/mkversioninfo
+++ b/components/cli/scripts/build/mkversioninfo
@@ -33,7 +33,7 @@ cat > ./cli/winresources/versioninfo.json <<EOL
     "Comments": "",
     "CompanyName": "${COMPANY_NAME}",
     "FileDescription": "Docker Client",
-    "FileVersion": "${VERSION_QUAD}",
+    "FileVersion": "${VERSION}",
     "InternalName": "",
     "LegalCopyright": "Copyright © 2015-$(date +'%Y') Docker Inc.",
     "LegalTrademarks": "",