Revert attempts to fix bundle upload to files.squeak.org

squeak-smalltalk · Oct 19, 2022 · 01cde22 · 01cde22
1 parent 7b2fea4
commit 01cde22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml
@@ -134,7 +134,7 @@ jobs:
     name: 📦 Prepare bundles for ${{ matrix.smalltalk }}
     env:
       SMALLTALK_VERSION: ${{ matrix.smalltalk }}
-      SHOULD_DEPLOY: false # ${{ endsWith(github.ref, 'squeak-trunk') }}
+      SHOULD_DEPLOY: ${{ endsWith(github.ref, 'squeak-trunk') }}
       SHOULD_CODESIGN: ${{ endsWith(github.ref, 'squeak-trunk') }}
       # VM_RC_TAG: "202205110711" # comment out to use VM from files.squeak.org/base that fits ${{ matrix.smalltalk }}
 

diff --git a/deploy_bundles.sh b/deploy_bundles.sh
@@ -85,23 +85,10 @@ else
 fi
 UPSTREAM_PATH="${UPSTREAM_PATH}/${IMAGE_NAME}"
 
-ssh-keygen -R ${PROXY_HOST}
+
 ssh-keyscan -t ecdsa-sha2-nistp256 -p "${PROXY_PORT}" "${PROXY_HOST}" 2>&1 | tee -a "${HOME}/.ssh/known_hosts" > /dev/null;
 echo "${UPSTREAM_HOST} ecdsa-sha2-nistp256 ${SSH_PUBLIC_KEY}" | tee -a "${HOME}/.ssh/known_hosts" > /dev/null;
-
-SSH_CONFIG_PATH=${HOME}/.ssh/config
-touch ${SSH_CONFIG_PATH}
-if grep -vq "^Host ${PROXY_HOST}$" ${SSH_CONFIG_PATH}; then
-cat >> ${SSH_CONFIG_PATH} <<EOF
-Host $PROXY_HOST
-         User $PROXY_USER
-         IdentityFile $SSH_KEY_FILEPATH
-         IdentitiesOnly yes
-         PreferredAuthentications publickey
-         PubkeyAuthentication yes
-EOF
-fi
-rsync -rvz --ignore-existing -e "ssh -o ProxyJump=${PROXY_HOST} -l ${UPSTREAM_USER} -i ${SSH_KEY_FILEPATH}" "${PRODUCT_PATH}/" "${UPSTREAM_HOST}:${UPSTREAM_PATH}/";
+rsync -rvz --ignore-existing -e "ssh -o ProxyCommand='ssh -l ${PROXY_USER} -i ${SSH_KEY_FILEPATH} -p ${PROXY_PORT} -W %h:%p ${PROXY_HOST}' -l ${UPSTREAM_USER} -i ${SSH_KEY_FILEPATH}" "${PRODUCT_PATH}/" "${UPSTREAM_HOST}:${UPSTREAM_PATH}/";
 
 end_group