Archive release and set proper version

.github/workflows/dockerd.yml

@@ -116,6 +116,7 @@ jobs:
         name: Build binaries
         run: |
           & docker run --name ${{ env.TEST_CTN_NAME }} -e "DOCKER_GITCOMMIT=${{ github.sha }}" `
+              -e "DOCKER_VERSION=${{ needs.prepare.outputs.tag }}" `
               -v "${{ github.workspace }}\go-build:C:\Users\ContainerAdministrator\AppData\Local\go-build" `
               -v "${{ github.workspace }}\go\pkg\mod:C:\gopath\pkg\mod" `
               ${{ env.TEST_IMAGE_NAME }} hack\make.ps1 -Daemon -Client
@@ -152,6 +153,14 @@ jobs:
         name: List artifacts
         run: |
           tree -nh ${{ env.BIN_OUT }}
+      -
+        name: Archive artifacts
+        run: |
+          tar czvf "${{ env.BIN_OUT }}/docker-${{ needs.prepare.outputs.tag }}.windows-amd64.tar.gz" --sort=name ${{ env.BIN_OUT }}
+      -
+        name: List artifacts
+        run: |
+          tree -nh ${{ env.BIN_OUT }}
       -
         name: GitHub Release
         if: startsWith(github.ref, 'refs/tags/v')
@@ -160,5 +169,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
-          files: ${{ env.BIN_OUT }}/*
+          files: ${{ env.BIN_OUT }}/*.tar.gz
           name: ${{ needs.prepare.outputs.tag }}

hack/make.ps1

@@ -463,7 +463,7 @@ Try {
     if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' }
 
     # Get the version of docker (eg 17.04.0-dev)
-    $dockerVersion="0.0.0-dev"
+    $dockerVersion="$env:DOCKER_VERSION"
     # Overwrite dockerVersion if VERSION Environment variable is available
     if (Test-Path Env:\VERSION) { $dockerVersion=$env:VERSION }