ci: --dryrun -> --dry-run

This commit is contained in:
Anmol Sethi 2022-11-13 22:59:09 -08:00
parent b916a317a0
commit be6f186ee0
4 changed files with 12 additions and 13 deletions

View file

@ -5,7 +5,7 @@ cd -- "$(dirname "$0")/../.."
help() {
cat <<EOF
usage: $0 [--rebuild] [--local] [--dryrun] [--run=regex] [--host-only]
usage: $0 [--rebuild] [--local] [--dry-run] [--run=regex] [--host-only]
$0 builds D2 release archives into ./ci/release/build/<version>/d2-<version>.tar.gz
@ -53,9 +53,9 @@ main() {
flag_noarg && shift "$FLAGSHIFT"
LOCAL=1
;;
dryrun)
dry-run)
flag_noarg && shift "$FLAGSHIFT"
DRYRUN=1
DRY_RUN=1
;;
run)
flag_reqarg && shift "$FLAGSHIFT"
@ -131,7 +131,7 @@ build() {
}
build_local() {
export DRYRUN \
export DRY_RUN \
HW_BUILD_DIR \
VERSION \
OS \
@ -143,7 +143,7 @@ build_local() {
build_rhost() {
sh_c ssh "$RHOST" mkdir -p src
sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/"
sh_c ssh -tttt "$RHOST" "DRYRUN=${DRYRUN-} \
sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \
HW_BUILD_DIR=$HW_BUILD_DIR \
VERSION=$VERSION \
OS=$OS \

View file

@ -5,14 +5,13 @@ cd -- "$(dirname "$0")/../../.."
help() {
cat <<EOF
usage: $0 [--dryrun]
usage: $0 [--dry-run]
$0 creates and ensures the d2 builders in AWS.
EOF
}
main() {
unset DRYRUN
while :; do
flag_parse "$@"
case "$FLAG" in
@ -20,9 +19,9 @@ main() {
help
return 0
;;
dryrun)
dry-run)
flag_noarg && shift "$FLAGSHIFT"
DRYRUN=1
DRY_RUN=1
;;
'')
shift "$FLAGSHIFT"

View file

@ -20,7 +20,7 @@ Flags:
with changelogs/template.md and instead keep it the same as
changelogs/v0.0.99-alpha.1.md. This is because you want to maintain the
changelog entries for the eventual final release.
--dryrun: Print the commands that would be ran without executing them.
--dry-run: Print the commands that would be ran without executing them.
Process:
@ -78,9 +78,9 @@ main() {
flag_noarg && shift "$FLAGSHIFT"
PRERELEASE=1
;;
dryrun)
dry-run)
flag_noarg && shift "$FLAGSHIFT"
DRYRUN=1
DRY_RUN=1
;;
'')
shift "$FLAGSHIFT"

2
ci/sub

@ -1 +1 @@
Subproject commit 30d7e137c97f2d2e2960a52adadc5019a02bfa30
Subproject commit 4f1fb95079b0ef0057db7ea65db5a1ca9f053dda