[Bugfix] Update staging script so that Windows binaries have a .exe f…

…ile extension in the staging bucket.
aws · Nov 29, 2017 · e36a7d1 · e36a7d1
1 parent 28cf8fd
commit e36a7d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/scripts/publish-staged b/scripts/publish-staged
@@ -49,7 +49,7 @@ publish_s3() {
 		dexec s3_pull_push "s3://${STAGE_S3_BUCKET}/ecs-cli-darwin-amd64-${tag}" "s3://${PUBLISH_S3_BUCKET}/ecs-cli-darwin-amd64-${tag}"
 		dexec s3_pull_push "s3://${STAGE_S3_BUCKET}/ecs-cli-darwin-amd64-${tag}.md5" "s3://${PUBLISH_S3_BUCKET}/ecs-cli-darwin-amd64-${tag}.md5"
 		echo "Publishing as ecs-cli-windows-amd64-${tag}.exe"
-		dexec s3_pull_push "s3://${STAGE_S3_BUCKET}/ecs-cli-windows-amd64-${tag}" "s3://${PUBLISH_S3_BUCKET}/ecs-cli-windows-amd64-${tag}.exe"
+		dexec s3_pull_push "s3://${STAGE_S3_BUCKET}/ecs-cli-windows-amd64-${tag}.exe" "s3://${PUBLISH_S3_BUCKET}/ecs-cli-windows-amd64-${tag}.exe"
 		dexec s3_pull_push "s3://${STAGE_S3_BUCKET}/ecs-cli-windows-amd64-${tag}.md5" "s3://${PUBLISH_S3_BUCKET}/ecs-cli-windows-amd64-${tag}.md5"
 	done
 }

diff --git a/scripts/stage.sh b/scripts/stage.sh
@@ -103,22 +103,27 @@ if ! ${ALLOW_DIRTY}; then
 fi
 
 make docker-build
-mv bin/windows-amd64/ecs-cli.exe bin/windows-amd64/ecs-cli
 
-for platform in "linux-amd64" "darwin-amd64" "windows-amd64"; do
-	artifact="bin/${platform}/ecs-cli"
+publish_binary() {
+	platform=$1
+	extension=$2
+	artifact="bin/${platform}/ecs-cli${extension}"
 	artifact_md5="$(mktemp)"
 	md5sum "${artifact}" | sed 's/ .*//' > "${artifact_md5}"
 
 	for tag in ${ARTIFACT_TAG_VERSION} ${ARTIFACT_TAG_SHA} ${ARTIFACT_TAG_LATEST}; do
-		key_name="ecs-cli-${platform}-${tag}"
+		key_name="ecs-cli-${platform}-${tag}${extension}"
 		echo "Publishing as ${key_name} with md5sum $(cat ${artifact_md5})"
 		dexec s3_cp "${artifact}" "s3://${S3_BUCKET}/${key_name}"
-		dexec s3_cp "${artifact_md5}" "s3://${S3_BUCKET}/${key_name}.md5"
+		dexec s3_cp "${artifact_md5}" "s3://${S3_BUCKET}/ecs-cli-${platform}-${tag}.md5"
 	done
 
 	rm "${artifact_md5}"
-done
+}
+
+publish_binary "linux-amd64" ""
+publish_binary "darwin-amd64" ""
+publish_binary "windows-amd64" ".exe"
 
 cd "${CWD}"