From c079596cbcb566653687622d230e7f4055bd605b Mon Sep 17 00:00:00 2001
From: Robert Fratto <robertfratto@gmail.com>
Date: Fri, 5 Apr 2024 15:01:24 -0400
Subject: [PATCH] ci: fix Windows shell commands

---
 .drone/drone.yml              | 22 +++++++++++-----------
 .drone/util/pipelines.jsonnet |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.drone/drone.yml b/.drone/drone.yml
index 1481accf81..57b72a80ba 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -302,11 +302,11 @@ platform:
   version: "1809"
 steps:
 - commands:
-  - '& "C:/Program Files/git/bin/bash.exe" -c "mkdir -p $HOME/.docker"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "printenv GCR_CREDS > $HOME/.docker/config.json"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "./tools/ci/docker-containers-windows
-    alloy-devel"'
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''mkdir -p $HOME/.docker'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''printenv GCR_CREDS > $HOME/.docker/config.json'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''./tools/ci/docker-containers-windows
+    alloy-devel'''
   environment:
     DOCKER_LOGIN:
       from_secret: docker_login
@@ -379,11 +379,11 @@ platform:
   version: "1809"
 steps:
 - commands:
-  - '& "C:/Program Files/git/bin/bash.exe" -c "mkdir -p $HOME/.docker"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "printenv GCR_CREDS > $HOME/.docker/config.json"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD"'
-  - '& "C:/Program Files/git/bin/bash.exe" -c "./tools/ci/docker-containers-windows
-    alloy"'
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''mkdir -p $HOME/.docker'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''printenv GCR_CREDS > $HOME/.docker/config.json'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD'''
+  - '& "C:/Program Files/git/bin/bash.exe" -c ''./tools/ci/docker-containers-windows
+    alloy'''
   environment:
     DOCKER_LOGIN:
       from_secret: docker_login
@@ -565,6 +565,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 33ad6940aa3d0615eb3be75bbeee0a90910b5b03280c1a80cc664abeb0de2932
+hmac: 3484a2c2210641cb0e653616c7100ec52f49cb68c7f20647248de013e0da1826
 
 ...
diff --git a/.drone/util/pipelines.jsonnet b/.drone/util/pipelines.jsonnet
index 4bfbd29fa1..b65d2f9bcf 100644
--- a/.drone/util/pipelines.jsonnet
+++ b/.drone/util/pipelines.jsonnet
@@ -20,5 +20,5 @@
     },
   },
 
-  windows_command(command):: '& "C:/Program Files/git/bin/bash.exe" -c "%s"' % command,
+  windows_command(command):: '& "C:/Program Files/git/bin/bash.exe" -c \'%s\'' % command,
 }