mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 11:19:51 +02:00
Code Issues Projects Releases Wiki Activity

Migrate starcatcher-publish step to sftp

Browse Source
This commit is contained in:
Tamás Bálint Misius
2024-10-24 08:50:32 +02:00
parent ca930c2494
commit d4cbdc84ca
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/starcatcher-publish.sh vendored
View File

@@ -3,18 +3,21 @@
set -euo pipefail set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
cat << NETRC > ~/.netrc host=$(echo "$PUBLISH_HOSTPORT" | cut -d ':' -f 1)
machine $(echo $PUBLISH_HOSTPORT | cut -d ':' -f 1) port=$(echo "$PUBLISH_HOSTPORT" | cut -d ':' -f 2)
login $PUBLISH_USERNAME
password $PUBLISH_PASSWORD
NETRC
chmod 660 ~/.netrc
mountpoint=ftpmnt set +e
mkdir $mountpoint mkdir ~/.ssh
curlftpfs "$PUBLISH_HOSTPORT" $mountpoint -o ssl,ciphers='ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-GCM-SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256' chmod 700 ~/.ssh
touch ~/.ssh/known_hosts
chmod 600 ~/.ssh/known_hosts
set -e
echo "[$host]:$port ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDsmJkDd7Rxnuuf4kpbJCDZvkO03lp4lmpzGmFW6LCqG" >> ~/.ssh/known_hosts
commands="quit"$'\n'
if [[ -z ${PUBLISH_ACCESSCHECK-} ]]; then if [[ -z ${PUBLISH_ACCESSCHECK-} ]]; then
cp $PUBLISH_FILENAME $mountpoint/${PUBLISH_DIRECTORY:-.}/ commands="put $PUBLISH_FILENAME"$'\n'"$commands"
commands="cd ${PUBLISH_DIRECTORY:-.}"$'\n'"$commands"
fi fi
fusermount -u $mountpoint SSHPASS="$PUBLISH_PASSWORD" sshpass -e sftp -oPort="$port" -oBatchMode=no -b - "$PUBLISH_USERNAME@$host" <<< "$commands"
rmdir $mountpoint

22
.github/workflows/build.yaml vendored
View File

@@ -14,7 +14,7 @@ on:
jobs: jobs:
prepare: prepare:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
outputs: outputs:
do_release: ${{ steps.prepare.outputs.do_release }} do_release: ${{ steps.prepare.outputs.do_release }}
build_matrix: ${{ steps.prepare.outputs.build_matrix }} build_matrix: ${{ steps.prepare.outputs.build_matrix }}
@@ -39,13 +39,13 @@ jobs:
- id: prepare - id: prepare
run: python ./.github/prepare.py run: python ./.github/prepare.py
env: env:
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }} PUBLISH_HOSTPORT: ${{ vars.STARCATCHER_PUBLISH_HOSTPORT }}
GITHUB_REF: ${{ github.ref }} GITHUB_REF: ${{ github.ref }}
- if: steps.prepare.outputs.do_publish == 'yes' - if: steps.prepare.outputs.do_publish == 'yes'
run: sudo apt update && sudo apt install curlftpfs && bash -c './.github/starcatcher-publish.sh' run: bash -c './.github/starcatcher-publish.sh'
env: env:
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }} PUBLISH_HOSTPORT: ${{ vars.STARCATCHER_PUBLISH_HOSTPORT }}
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME }} PUBLISH_USERNAME: ${{ vars.STARCATCHER_PUBLISH_USERNAME }}
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }} PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }}
PUBLISH_ACCESSCHECK: yes PUBLISH_ACCESSCHECK: yes
- if: steps.prepare.outputs.do_release == 'yes' - if: steps.prepare.outputs.do_release == 'yes'
@@ -147,7 +147,7 @@ jobs:
path: build/${{ matrix.debug_asset_path }} path: build/${{ matrix.debug_asset_path }}
name: ${{ matrix.debug_asset_name }} name: ${{ matrix.debug_asset_name }}
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
needs: [build, prepare] needs: [build, prepare]
strategy: strategy:
fail-fast: false fail-fast: false
@@ -160,15 +160,15 @@ jobs:
with: with:
name: ${{ matrix.asset_name }} name: ${{ matrix.asset_name }}
- run: mv ${{ matrix.asset_path }} ${{ matrix.starcatcher_name }} - run: mv ${{ matrix.asset_path }} ${{ matrix.starcatcher_name }}
- run: sudo apt update && sudo apt install curlftpfs && bash -c './.github/starcatcher-publish.sh' - run: bash -c './.github/starcatcher-publish.sh'
env: env:
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }} PUBLISH_HOSTPORT: ${{ vars.STARCATCHER_PUBLISH_HOSTPORT }}
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME }} PUBLISH_USERNAME: ${{ vars.STARCATCHER_PUBLISH_USERNAME }}
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }} PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }}
PUBLISH_DIRECTORY: ${{ secrets.STARCATCHER_PUBLISH_DIRECTORY }} PUBLISH_DIRECTORY: ${{ vars.STARCATCHER_PUBLISH_DIRECTORY }}
PUBLISH_FILENAME: ${{ matrix.starcatcher_name }} PUBLISH_FILENAME: ${{ matrix.starcatcher_name }}
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
needs: [build, publish, prepare] needs: [build, publish, prepare]
if: needs.prepare.outputs.do_publish == 'yes' if: needs.prepare.outputs.do_publish == 'yes'
steps: steps: