Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix Windows shell commands #136

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -565,6 +565,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 33ad6940aa3d0615eb3be75bbeee0a90910b5b03280c1a80cc664abeb0de2932
hmac: 3484a2c2210641cb0e653616c7100ec52f49cb68c7f20647248de013e0da1826

...
2 changes: 1 addition & 1 deletion .drone/util/pipelines.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Loading