From 1da90a030d3f8fa12f15b62014a11498fee9145f Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.xen@gmail.com>
Date: Sun, 22 Sep 2024 16:28:54 +0100
Subject: [PATCH] github: Update workflow actions to latest versions

---
 .github/workflows/ci.yml      |  4 ++--
 .github/workflows/release.yml | 30 +++---------------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a54105..4f3670f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set environment variables
       id: vars
@@ -50,7 +50,7 @@ jobs:
         mv $P-$V.zip _cidist/
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: greaseweazle-firmware.ci.${{ steps.vars.outputs.sha_short }}
         path: _cidist
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f3100f5..3c636b2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,12 +6,11 @@ on:
 name: Release
 
 jobs:
-
-  build-ubuntu:
+  build:
     runs-on: ubuntu-22.04
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set environment variables
       id: vars
@@ -26,34 +25,11 @@ jobs:
     - name: Dependency packages (pip)
       run: python3 -m pip install --user crcmod
 
-    - name: Build dist
+    - name: Build release
       run: |
         make -j4 dist
         mv out/*.zip .
 
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: greaseweazle-firmware.ci.${{ steps.vars.outputs.ver }}
-        path: greaseweazle-firmware-${{ steps.vars.outputs.ver }}.zip
-
-  finalise:
-    needs: build-ubuntu
-    runs-on: ubuntu-22.04
-    steps:
-
-    - uses: actions/checkout@v3
-
-    - name: Set environment variables
-      id: vars
-      run: |
-        echo "ver=$(echo ${{ github.ref }} | sed -e's#.*/v##')" >> $GITHUB_OUTPUT
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: greaseweazle-firmware.ci.${{ steps.vars.outputs.ver }}
-
     - name: Create Release
       id: create_release
       uses: ncipollo/release-action@v1