Merge pull request #3337 from crazy-max/fix-checkout

Fix checkout behavior and FileVersion Upstream-commit: 9fab13beacb9d4c53cf438d2a1cb9eccee8e2893 Component: cli
docker-archive · Oct 12, 2021 · 35266f1 · 35266f1
2 parents e2f83d4 + efa851d
commit 35266f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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": "",