luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci/release: Fixes

Browse source
This commit is contained in:
Anmol Sethi 2022-11-14 11:56:40 -08:00
parent d866f3fff8
commit 0c56cf8167
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/release/_install.sh
View file

@ -325,7 +325,7 @@ is_prefix_writable() {
# /usr/local owned by root but you don't need root to write to its subdirectories which # /usr/local owned by root but you don't need root to write to its subdirectories which
# is all we want to do. # is all we want to do.
if [ ! -w "$PREFIX/bin" ]; then if [ ! -w "$PREFIX/bin" ]; then
return 0 return 1
fi fi
} }

4
ci/release/build.sh
View file

@ -170,8 +170,9 @@ OS=$OS \
ARCH=$ARCH \ ARCH=$ARCH \
ARCHIVE=$ARCHIVE \ ARCHIVE=$ARCHIVE \
TERM=$TERM \ TERM=$TERM \
PATH=\"/usr/local/bin:/usr/local/sbin\${PATH+:\$PATH}\" \ PATH=\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\${PATH+:\$PATH}\" \
./src/d2/ci/release/_build.sh" ./src/d2/ci/release/_build.sh"
sh_c mkdir -p $HW_BUILD_DIR
sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE"
} }
@ -186,6 +187,7 @@ ARCH=$ARCH \
ARCHIVE=$ARCHIVE \ ARCHIVE=$ARCHIVE \
TERM=$TERM \ TERM=$TERM \
./src/d2/ci/release/build_docker.sh" ./src/d2/ci/release/build_docker.sh"
sh_c mkdir -p $HW_BUILD_DIR
sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE"
} }

16
ci/release/builders/aws_ensure.sh
View file

@ -5,7 +5,7 @@ cd -- "$(dirname "$0")/../../.."
help() { help() {
cat <<EOF cat <<EOF
usage: $0 [--dry-run] usage: $0 [--dry-run] [--skip-create]
$0 creates and ensures the d2 builders in AWS. $0 creates and ensures the d2 builders in AWS.
EOF EOF
@ -23,6 +23,10 @@ main() {
flag_noarg && shift "$FLAGSHIFT" flag_noarg && shift "$FLAGSHIFT"
DRY_RUN=1 DRY_RUN=1
;; ;;
skip-create)
flag_noarg && shift "$FLAGSHIFT"
SKIP_CREATE=1
;;
'') '')
shift "$FLAGSHIFT" shift "$FLAGSHIFT"
break break
@ -36,7 +40,9 @@ main() {
flag_errusage "no arguments are accepted" flag_errusage "no arguments are accepted"
fi fi
create_rhosts if [ -z "${SKIP_CREATE-}" ]; then
create_rhosts
fi
init_rhosts init_rhosts
} }
@ -228,9 +234,9 @@ init_rhost_macos() {
sleep 5 sleep 5
done done
sh_c ssh "$RHOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""' sh_c ssh "$RHOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""'
sh_c ssh "$RHOST" '/usr/local/bin/brew update' sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update'
sh_c ssh "$RHOST" '/usr/local/bin/brew upgrade' sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade'
sh_c ssh "$RHOST" '/usr/local/bin/brew install go' sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go'
} }
main "$@" main "$@"