From 4915a93aa3a2205f64ba4c41c306fdd54ddf2d4a Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Sun, 25 Aug 2024 22:41:09 +0200
Subject: [PATCH] build.yml: Consistently use @v4 script versions

---
 .github/workflows/build.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0a315c..e710e08 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,7 @@ jobs:
       DEBUG: 0
       # When downloading python from sigrok.org, smth is wrong with the cert
       WGET: "wget -c --quiet --no-check-certificate"
+      ARTIFACT_VERSION: "NIGHTLY"
 
     steps:
       - name: Checkout sigrok-build
@@ -106,7 +107,7 @@ jobs:
       - name: Rename artifact
         run: |
           cd pulseview/build/contrib
-          mv pulseview-*installer.exe pulseview-NIGHTLY-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe
+          mv pulseview-*installer.exe pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -138,6 +139,7 @@ jobs:
       DEBUG: 0
       # When downloading python from sigrok.org, smth is wrong with the cert
       WGET: "wget -c --quiet --no-check-certificate"
+      ARTIFACT_VERSION: "NIGHTLY"
 
     steps:
       - name: Checkout sigrok-build
@@ -180,7 +182,7 @@ jobs:
       - name: Rename artifact
         run: |
           cd sigrok-cli/contrib
-          mv sigrok-cli-*installer.exe sigrok-cli-NIGHTLY-${{ matrix.target.target }}-debug-installer.exe
+          mv sigrok-cli-*installer.exe sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -231,8 +233,6 @@ jobs:
       ARTIFACT_TITLE: "PulseView"
       ARTIFACT_BIN_NAME: "pulseview"
       ARTIFACT_VERSION: "NIGHTLY"
-      # See https://github.com/actions/checkout/issues/1590#issuecomment-2219382750
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
     steps:
       - name: Update dependencies
@@ -254,7 +254,7 @@ jobs:
           ./sigrok-appimage-build-dependencies.sh
 
       - name: Checkout PulseView
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: sigrokproject/pulseview
           path: pulseview
@@ -283,10 +283,10 @@ jobs:
       - name: Rename artifact
         run: |
           cd sigrok-build/ci/appimage/appimage-build
-          mv PulseView-*.AppImage pulseview-NIGHTLY-${{ matrix.target.target }}-${{ matrix.build_type.name }}.appimage
+          mv PulseView-*.AppImage pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}.appimage
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifact-pulseview-${{ matrix.target.target }}-appimage
           path: sigrok-build/ci/appimage/appimage-build/pulseview-*.appimage
@@ -378,7 +378,7 @@ jobs:
       - name: Rename artifact
         run: |
           cd sigrok-build/ci/appimage/appimage-build
-          mv sigrok-cli-*.AppImage sigrok-cli-NIGHTLY-${{ matrix.target.target }}-debug.appimage
+          mv sigrok-cli-*.AppImage sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage
 
       - name: Upload artifact
         id: upload_sigrok-cli_appimage_artifact
@@ -387,7 +387,7 @@ jobs:
           name: artifact-sigrok-cli-x86_64-appimage
           path: sigrok-build/ci/appimage/appimage-build/sigrok-cli-*.appimage
 
-      - name: Output artifact URL
+      - name: Output artifact URL to log
         # Only relevant for pull requests
         if: (github.event_name == 'pull_request')
         run: |
@@ -399,7 +399,7 @@ jobs:
         uses: actions/github-script@v7
         env:
           PR_NOTES: |
-            sigrok-cli AppImage created: ${{ steps.upload_sigrok-cli_appimage_artifact.outputs.artifact-url }}
+            sigrok-cli ${{ matrix.target.target }} AppImage created: ${{ steps.upload_sigrok-cli_appimage_artifact.outputs.artifact-url }}
         with:
           script: |
             github.rest.issues.createComment({
@@ -572,8 +572,6 @@ jobs:
       - build_pulseview_macos
 
     steps:
-      - name: Download AppImage artifacts
-        uses: actions/download-artifact@v3
       - name: Download all other artifacts
         uses: actions/download-artifact@v4
       - name: Inspect directory after downloading artifacts
@@ -611,8 +609,6 @@ jobs:
       - build_sigrok-cli_macos
 
     steps:
-      - name: Download AppImage artifacts
-        uses: actions/download-artifact@v3
       - name: Download all other artifacts
         uses: actions/download-artifact@v4
       - name: Inspect directory after downloading artifacts