From 06e6e645c35bde5e121b773d9547f128d7e90291 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Wed, 9 Aug 2023 11:14:04 -0600
Subject: [PATCH] Update github actions to no longer use deprecated features,
 and to not fail on forks

---
 .github/workflows/pr.yml             |  4 ++--
 .github/workflows/stable-release.yml | 34 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 38c26f88..95403de0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,14 +10,14 @@ jobs:
 
     steps:
       - name: "Checkout source"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Build artifacts"
         run: |
           ARCH=rm make docker
           ARCH=kobo make docker
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: artifacts/
diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
index e6a1ab93..d68f7d44 100644
--- a/.github/workflows/stable-release.yml
+++ b/.github/workflows/stable-release.yml
@@ -13,10 +13,14 @@ jobs:
   pre-release:
     name: "release"
     runs-on: "ubuntu-latest"
+    env:
+      ssh_host: ${{ secrets.HOST }}
+      ssh_username: ${{ secrets.USERNAME }}
+      ssh_password: ${{ secrets.PASSWORD }}
 
     steps:
       - name: "Checkout source"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
 
       - name: "Build artifacts"
@@ -28,30 +32,40 @@ jobs:
         id: vars
         shell: bash
         run: |
-          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-          echo "::set-output name=sha::$(git rev-parse --short HEAD)"
-          echo "::set-output name=date::$(date -- +%Y%m%d_%H%M)"
+          echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> "$GITHUB_OUTPUT"
+          echo "sha=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
+          echo "date=$(date -- +%Y%m%d_%H%M)" >> "$GITHUB_OUTPUT"
 
       - name: "Copy artifacts"
         run: cp artifacts/ ${{ steps.vars.outputs.date }}_${{ steps.vars.outputs.sha }} -R
 
       - name: copy artifacts to GITHUB_SHA
+        if: ${{ env.ssh_host != '' }}
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
+          host: ${{ env.ssh_host }}
+          username: ${{ env.ssh_username }}
+          password: ${{ env.ssh_password }}
           port: 22
           source: ${{ steps.vars.outputs.date }}_${{ steps.vars.outputs.sha }}
           target: build/${{ steps.vars.outputs.branch }}
 
       - name: copy artifacts to latest/
+        if: ${{ env.ssh_host != '' }}
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
+          host: ${{ env.ssh_host }}
+          username: ${{ env.ssh_username }}
+          password: ${{ env.ssh_password }}
           port: 22
           source: artifacts/*
           strip_components: 1
           target: build/${{ steps.vars.outputs.branch }}/latest
+
+      - name: Upload artifacts
+        if: ${{ env.ssh_host == "" }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifacts
+          path: artifacts/
+