fix

Author: fmenezes

build/ci/release.yml

@@ -422,31 +422,6 @@ tasks:
       - func: "install goreleaser"
       - func: "install macos notarization service"
       - func: "install gh-token"
-      # - command: subprocess.exec
-      #   type: test
-      #   params:
-      #     working_dir: src/github.com/mongodb/mongodb-atlas-cli
-      #     include_expansions_in_env:
-      #       - project
-      #       - revision
-      #       - created_at
-      #     env:
-      #       BUCKET: mongodb-mongocli-build
-      #       unstable: ${unstable}
-      #     binary: build/package/download-win-binaries.sh
-      # - command: subprocess.exec
-      #   type: test
-      #   params:
-      #     include_expansions_in_env:
-      #       - unstable
-      #     env:
-      #       ARTIFACTORY_USERNAME: ${artifactory_username}
-      #       ARTIFACTORY_PASSWORD: ${artifactory_password}
-      #       GRS_USERNAME: ${garasign_username}
-      #       GRS_PASSWORD: ${garasign_password}
-      #       AUTHENTICODE_KEY_NAME: ${authenticode_key_name}
-      #     working_dir: src/github.com/mongodb/mongodb-atlas-cli
-      #     binary: build/package/windows_notarize.sh
       - func: "package"
         vars:
           unstable: ${unstable}
@@ -651,8 +626,6 @@ buildvariants:
     tasks:
       - name: package_goreleaser
         depends_on:
-          - name: package_msi
-            variant: release_atlascli_msi
           - name: generate_and_upload_sbom
             variant: ssdlc
   - name: copybara
@@ -666,17 +639,6 @@ buildvariants:
       <<: *go_linux_version
     tasks:
       - name: copybara
-  - name: release_atlascli_msi
-    display_name: "Release AtlasCLI (go-msi)"
-    run_on:
-      - windows-vsCurrent-small
-    git_tag_only: true
-    tags:
-      - foliage_health
-    expansions:
-      <<: *go_windows_version
-    tasks:
-      - name: package_msi
   - name: release_atlascli_publish
     display_name: "Publish AtlasCLI Generator"
     run_on:

build/package/windows_build_msi.sh

@@ -25,17 +25,24 @@ host=$(jq -r '.[0].dns_name' "$hostsfile")
 
 mkdir -p ./build/package/msi/bin
 
-cp bin/atlas.exe ./build/package/msi/bin/atlas.exe
+cp dist/windows_windows_amd64_v1/bin/atlas.exe ./build/package/msi/bin/atlas.exe
+git tag --list 'atlascli/v*' --sort=-taggerdate | head -1 | cut -d 'v' -f 2 > ./build/package/msi/version.txt
 
 cd ./build/package
-git tag --list 'atlascli/v*' --sort=-taggerdate | head -1 | cut -d 'v' -f 2 > msi/version.txt
 zip -r msi.zip msi >/dev/null 2>&1
 cd ../..
 
 scp -i "$keyfile" -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -tt "${user}@${host}" "build/package/msi.zip:/cygdrive/c/Users/Administrator/msi.zip"
 
 ssh -i "$keyfile" -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${user}@${host}" bash -c 'unzip -o "/cygdrive/c/Users/Administrator/msi.zip" -d "/cygdrive/c/Users/Administrator/msi" && rm -rf "/cygdrive/c/Users/Administrator/msi.zip" && cd "/cygdrive/c/Users/Administrator/msi" && ./generate-msi.sh'
 
-scp -i "$keyfile" -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -tt "${user}@${host}" "/cygdrive/c/Users/Administrator/msi/out.msi:${PWD}/build/package/msi/out.msi"
+VERSION_GIT="$(git tag --list "atlascli/v*" --sort=taggerdate | tail -1 | cut -d "v" -f 2)"
+VERSION_NAME="$VERSION_GIT"
+if [[ "${unstable-}" == "-unstable" ]]; then
+	VERSION_NAME="$VERSION_GIT-next"
+fi
+MSI_FILE="${PWD}/bin/mongodb-atlas-cli_${VERSION_NAME}_windows_x86_64.msi"
 
-ls -la ./build/package/msi/
+scp -i "$keyfile" -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -tt "${user}@${host}" "/cygdrive/c/Users/Administrator/msi/out.msi:${MSI_FILE}"
+
+ls -la ./bin

build/package/windows_notarize.sh

@@ -16,17 +16,9 @@
 
 set -Eeou pipefail
 
-# VERSION_GIT="$(git tag --list "atlascli/v*" --sort=taggerdate | tail -1 | cut -d "v" -f 2)"
-# VERSION_NAME="$VERSION_GIT"
-# if [[ "${unstable-}" == "-unstable" ]]; then
-# 	VERSION_NAME="$VERSION_GIT-next"
-# fi
-
-EXE_FILE="bin/atlas.exe"
-# MSI_FILE="bin/mongodb-atlas-cli_${VERSION_NAME}_windows_x86_64.msi"
+EXE_FILE="dist/windows_windows_amd64_v1/bin/atlas.exe"
 
 if [[ -f "$EXE_FILE" ]]; then
-# if [[ -f "$EXE_FILE" && -f "$MSI_FILE" ]]; then
 	echo "${ARTIFACTORY_PASSWORD}" | podman login --password-stdin --username "${ARTIFACTORY_USERNAME}" artifactory.corp.mongodb.com
 
 	echo "GRS_CONFIG_USER1_USERNAME=${GRS_USERNAME}" > .env
@@ -41,14 +33,5 @@ if [[ -f "$EXE_FILE" ]]; then
 		artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-jsign \
 		/bin/bash -c "jsign --tsaurl http://timestamp.digicert.com -a ${AUTHENTICODE_KEY_NAME} \"$EXE_FILE\""
 
-	# echo "signing $MSI_FILE"
-	# podman run \
-	# 	--env-file=.env \
-	# 	--rm \
-	# 	-v "$(pwd):$(pwd)" \
-	# 	-w "$(pwd)" \
-	# 	artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-jsign \
-	# 	/bin/bash -c "jsign --tsaurl http://timestamp.digicert.com -a ${AUTHENTICODE_KEY_NAME} \"$MSI_FILE\""
-	
 	rm .env
 fi