From 2ea14c3e0caa0c72f5774610492e29ae7290c470 Mon Sep 17 00:00:00 2001
From: Dan Kluser <d@kluser.ch>
Date: Tue, 2 Jun 2026 21:43:03 +0200
Subject: [PATCH] ci: remove obsolete upload; using r2 going forward

---
 .github/workflows/build-image.yml    | 27 ----------------------
 .github/workflows/test-uploads.yml   | 34 ----------------------------
 .github/workflows/trigger-builds.yml |  3 ---
 3 files changed, 64 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 57915f5..743d846 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -15,12 +15,6 @@ on:
         type: string
         default: 'ubuntu2604'
     secrets:
-      REMOTE_SSH_KEY:
-        required: true
-      REMOTE_SSH_CONFIG:
-        required: true
-      REMOTE_SSH_KNOWN_HOSTS:
-        required: true
       R2_ACCESS_KEY_ID:
         required: true
       R2_SECRET_ACCESS_KEY:
@@ -129,27 +123,6 @@ jobs:
           path: meta/
           retention-days: 1
 
-      - name: Upload to remote
-        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
-        env:
-          SSH_KEY: ${{ secrets.REMOTE_SSH_KEY }}
-          SSH_CONFIG: ${{ secrets.REMOTE_SSH_CONFIG }}
-          SSH_KNOWN_HOSTS: ${{ secrets.REMOTE_SSH_KNOWN_HOSTS }}
-        run: |
-          DIR=$(mktemp -d)
-          echo "$SSH_KEY" > "$DIR/key"
-          chmod 600 "$DIR/key"
-          echo "$SSH_CONFIG" > "$DIR/config"
-          sed -i "s|~/.ssh/remote_key|$DIR/key|" "$DIR/config"
-          echo "$SSH_KNOWN_HOSTS" > "$DIR/known_hosts"
-          SSH="ssh -F $DIR/config -o UserKnownHostsFile=$DIR/known_hosts"
-          SCP="scp -F $DIR/config -o UserKnownHostsFile=$DIR/known_hosts"
-          DEST="image-${{ matrix.distro }}-${{ steps.version.outputs.ts }}"
-          $SSH remote mkdir -p "./$DEST"
-          $SCP image/output/*.img.xz "remote:./$DEST/"
-          $SSH remote 'ls -dt image-${{ matrix.distro }}-*/ | tail -n +5 | xargs rm -rf' || true
-          rm -rf "$DIR"
-
   release:
     needs: build
     runs-on: self-hosted
diff --git a/.github/workflows/test-uploads.yml b/.github/workflows/test-uploads.yml
index e4a43c9..04d71ab 100644
--- a/.github/workflows/test-uploads.yml
+++ b/.github/workflows/test-uploads.yml
@@ -65,24 +65,6 @@ jobs:
           path: meta/
           retention-days: 1
 
-      - name: Upload to remote
-        env:
-          SSH_KEY: ${{ secrets.REMOTE_SSH_KEY }}
-          SSH_CONFIG: ${{ secrets.REMOTE_SSH_CONFIG }}
-          SSH_KNOWN_HOSTS: ${{ secrets.REMOTE_SSH_KNOWN_HOSTS }}
-        run: |
-          DIR=$(mktemp -d)
-          echo "$SSH_KEY" > "$DIR/key"
-          chmod 600 "$DIR/key"
-          echo "$SSH_CONFIG" > "$DIR/config"
-          sed -i "s|~/.ssh/remote_key|$DIR/key|" "$DIR/config"
-          echo "$SSH_KNOWN_HOSTS" > "$DIR/known_hosts"
-          SSH="ssh -F $DIR/config -o UserKnownHostsFile=$DIR/known_hosts"
-          SCP="scp -F $DIR/config -o UserKnownHostsFile=$DIR/known_hosts"
-          $SSH remote mkdir -p ./test-upload
-          $SCP image/output/ps5-${{ matrix.distro }}.img.xz "remote:./test-upload/"
-          rm -rf "$DIR"
-
       - name: Cleanup
         if: always()
         run: rm -rf image/output meta
@@ -154,19 +136,3 @@ jobs:
           for d in ubuntu2604 arch cachyos; do
             rclone delete "r2:${{ secrets.R2_BUCKET }}/test-${d}.img.xz" -v || true
           done
-
-      - name: Clean up remote test files
-        env:
-          SSH_KEY: ${{ secrets.REMOTE_SSH_KEY }}
-          SSH_CONFIG: ${{ secrets.REMOTE_SSH_CONFIG }}
-          SSH_KNOWN_HOSTS: ${{ secrets.REMOTE_SSH_KNOWN_HOSTS }}
-        run: |
-          DIR=$(mktemp -d)
-          echo "$SSH_KEY" > "$DIR/key"
-          chmod 600 "$DIR/key"
-          echo "$SSH_CONFIG" > "$DIR/config"
-          sed -i "s|~/.ssh/remote_key|$DIR/key|" "$DIR/config"
-          echo "$SSH_KNOWN_HOSTS" > "$DIR/known_hosts"
-          SSH="ssh -F $DIR/config -o UserKnownHostsFile=$DIR/known_hosts"
-          $SSH remote rm -rf ./test-upload
-          rm -rf "$DIR"
diff --git a/.github/workflows/trigger-builds.yml b/.github/workflows/trigger-builds.yml
index 1556062..50a0e4c 100644
--- a/.github/workflows/trigger-builds.yml
+++ b/.github/workflows/trigger-builds.yml
@@ -17,9 +17,6 @@ jobs:
     with:
       distro: all
     secrets:
-      REMOTE_SSH_KEY: ${{ secrets.REMOTE_SSH_KEY }}
-      REMOTE_SSH_CONFIG: ${{ secrets.REMOTE_SSH_CONFIG }}
-      REMOTE_SSH_KNOWN_HOSTS: ${{ secrets.REMOTE_SSH_KNOWN_HOSTS }}
       R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
       R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
       R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}