diff --git a/.forgejo/workflows/signal-rebuild.yml b/.forgejo/workflows/signal-rebuild.yml index 09df0b9..9d78837 100644 --- a/.forgejo/workflows/signal-rebuild.yml +++ b/.forgejo/workflows/signal-rebuild.yml @@ -4,41 +4,24 @@ on: [push] jobs: test_service: - name: test_service - runs-on: native # make sure your runner has a "native" label + runs-on: native steps: - name: Get branch - run: echo "BRANCH=$(echo \"${{ forgejo.ref }}\" | cut -d'/' -f3)" >> "$FORGEJO_ENV" - + run: echo "BRANCH=$(echo "${{ gitea.ref }}" | cut -d'/' -f3)" >> $GITHUB_ENV - name: Signal deprived.dev for rebuild env: SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }} GITKEY: ${{ secrets.GITKEY }} - PUBLIC_URL_BASE: ${{ vars.PUBLIC_URL_BASE }} - PUBLIC_POCKET_URL: ${{ vars.PUBLIC_POCKET_URL }} + PUBLIC_URL_BASE: ${{ variables.PUBLIC_URL_BASE }} + PUBLIC_POCKET_URL: ${{ variables.PUBLIC_POCKET_URL }} run: | - set -euo pipefail - sshkey=$(mktemp) - trap 'rm -f "$sshkey"' EXIT - - printf '%s\n' "$SSH_PRIVATE_KEY" > "$sshkey" - chmod 600 "$sshkey" - - echo "BRANCH is: $BRANCH" - + trap "rm -rf $sshkey" exit + echo -e $SSH_PRIVATE_KEY > $sshkey service="build-deprived-website-$BRANCH" - sshargs='-o LogLevel=ERROR -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - + sshargs="-o LogLevel=ERROR -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" echo "Starting systemd oneshot service: $service" - - # No -t, no extra quotes around $service - ssh -i "$sshkey" $sshargs deprivedbuilder@deprived.dev \ - "sudo /run/current-system/sw/bin/systemctl start $service" - - echo "Build Log:" - ssh -i "$sshkey" $sshargs deprivedbuilder@deprived.dev \ - "cat ~/latest_build.log" - + ssh -i $sshkey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no deprivedbuilder@deprived.dev -t "sudo /run/current-system/sw/bin/systemctl start $service" + echo "Build Log: $(ssh -i $sshkey $sshargs deprivedbuilder@deprived.dev "cat ~/latest_build.log")"