From f2c2d5f2d6fa526edda058b29084adc05d4c727a Mon Sep 17 00:00:00 2001
From: Rohan Sharan <rohan.sharan@mongodb.com>
Date: Mon, 23 Oct 2023 14:11:42 -0400
Subject: [PATCH] fx

---
 common.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/common.yml b/common.yml
index 880404269..1569a691f 100644
--- a/common.yml
+++ b/common.yml
@@ -274,7 +274,7 @@ functions:
         extract_to: src/github.com/mongodb/mongo-tools/
         bucket: mciuploads
 
-  "sign msi installer":
+  "sign msi installer and zip file for windows":
     - command: shell.exec
       type: system
       params:
@@ -289,9 +289,10 @@ functions:
       params:
         working_dir: src/github.com/mongodb/mongo-tools/
         script: |
-          if [ "${mongo_os}" = "osx" ]; then
+          if [ "${mongo_os}" -ne "windows-64" ]; then
               exit 0
           fi
+
           /usr/local/bin/notary-client.py \
               --key-name "server-Tools" \
               --auth-token-file ./signing_auth_token \
@@ -302,6 +303,16 @@ functions:
               --package-file-suffix "" \
               release.msi
 
+          /usr/local/bin/notary-client.py \
+              --key-name "server-Tools" \
+              --auth-token-file ./signing_auth_token \
+              --comment "Evergreen Automatic Signing (mongo-tools)" \
+              --notary-url http://notary-service.build.10gen.cc:5000 \
+              --skip-missing \
+              --outputs "sig" \
+              --package-file-suffix "" \
+              release.zip
+
   "sign macos zip":
     command: subprocess.exec
     params:
@@ -360,6 +371,12 @@ functions:
           if [ "${mongo_os}" = "osx" ]; then
               exit 0
           fi
+
+          # Windows .zip files are signed separately.
+          if [ "${mongo_os}" = "windows-64" ]; then
+              exit 0
+          fi
+
           /usr/local/bin/notary-client.py \
               --key-name "server-Tools" \
               --auth-token-file ./signing_auth_token \
@@ -725,7 +742,7 @@ tasks:
     commands:
       - func: "fetch source"
       - func: "fetch dist release artifacts"
-      - func: "sign msi installer"
+      - func: "sign msi installer and zip file for windows"
       - func: "sign macos zip"
       - func: "sign linux packages"
       - func: "sign archives"