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

release/build.sh: RHOST -> REMOTE_HOST

Browse source
This commit is contained in:
Anmol Sethi 2022-11-16 04:02:35 -08:00
parent 93e95ad68f
commit 4c731d7b24
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ci/release/build.sh
View file

@ -118,10 +118,10 @@ build() {
macos) macos)
case $ARCH in case $ARCH in
amd64) amd64)
RHOST=$TSTRUCT_MACOS_AMD64_BUILDER build_rhost_macos REMOTE_HOST=$TSTRUCT_MACOS_AMD64_BUILDER build_remote_macos
;; ;;
arm64) arm64)
RHOST=$TSTRUCT_MACOS_ARM64_BUILDER build_rhost_macos REMOTE_HOST=$TSTRUCT_MACOS_ARM64_BUILDER build_remote_macos
;; ;;
*) *)
warn "no builder for OS=$OS ARCH=$ARCH, building locally..." warn "no builder for OS=$OS ARCH=$ARCH, building locally..."
@ -132,10 +132,10 @@ build() {
linux) linux)
case $ARCH in case $ARCH in
amd64) amd64)
RHOST=$TSTRUCT_LINUX_AMD64_BUILDER build_rhost_linux REMOTE_HOST=$TSTRUCT_LINUX_AMD64_BUILDER build_remote_linux
;; ;;
arm64) arm64)
RHOST=$TSTRUCT_LINUX_ARM64_BUILDER build_rhost_linux REMOTE_HOST=$TSTRUCT_LINUX_ARM64_BUILDER build_remote_linux
;; ;;
*) *)
warn "no builder for OS=$OS ARCH=$ARCH, building locally..." warn "no builder for OS=$OS ARCH=$ARCH, building locally..."
@ -160,12 +160,12 @@ build_local() {
sh_c ./ci/release/_build.sh sh_c ./ci/release/_build.sh
} }
build_rhost_macos() { build_remote_macos() {
sh_c lockfile_ssh "$RHOST" .d2-build-lock sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock
trap unlockfile_ssh EXIT trap unlockfile_ssh EXIT
sh_c ssh "$RHOST" mkdir -p src sh_c ssh "$REMOTE_HOST" mkdir -p src
sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/"
sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
HW_BUILD_DIR=$HW_BUILD_DIR \ HW_BUILD_DIR=$HW_BUILD_DIR \
VERSION=$VERSION \ VERSION=$VERSION \
OS=$OS \ OS=$OS \
@ -175,15 +175,15 @@ TERM=$TERM \
PATH=\\\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/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 mkdir -p "$HW_BUILD_DIR"
sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE"
} }
build_rhost_linux() { build_remote_linux() {
sh_c lockfile_ssh "$RHOST" .d2-build-lock sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock
trap unlockfile_ssh EXIT trap unlockfile_ssh EXIT
sh_c ssh "$RHOST" mkdir -p src sh_c ssh "$REMOTE_HOST" mkdir -p src
sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/"
sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
HW_BUILD_DIR=$HW_BUILD_DIR \ HW_BUILD_DIR=$HW_BUILD_DIR \
VERSION=$VERSION \ VERSION=$VERSION \
OS=$OS \ OS=$OS \
@ -192,7 +192,7 @@ 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 mkdir -p "$HW_BUILD_DIR"
sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE"
} }
ssh() { ssh() {