From a970f55b555f69c5fcb40374eb50ad7b98cc8f96 Mon Sep 17 00:00:00 2001
From: Kyle Harding <kyle@balena.io>
Date: Tue, 19 Dec 2023 13:57:25 -0500
Subject: [PATCH 1/2] Update actions/upload-artifact to v4

Also ensure we are generating unique artifact names on upload.

Change-type: patch
Signed-off-by: Kyle Harding <kyle@balena.io>
See: https://github.com/product-os/flowzone/pull/827
---
 .github/actions/publish/action.yml | 6 +++---
 .github/actions/test/action.yml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
index 6f5c73d5..e0fc7e08 100644
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@@ -25,7 +25,7 @@ runs:
   using: "composite"
   steps:
     - name: Download custom source artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
         path: ${{ runner.temp }}
@@ -162,8 +162,8 @@ runs:
           -exec yq -i e .stagingPercentage=\"$percentage\" {} \;
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}
+        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
         path: dist
         retention-days: 1
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index 39ecaabd..e55c275a 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -57,7 +57,7 @@ runs:
       run: C:\"Program Files"\Git\usr\bin\tar.exe --force-local -acf ${{ runner.temp }}\custom.tgz .
 
     - name: Upload custom artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
         path: ${{ runner.temp }}/custom.tgz

From ecb24dad251fbb9b3f92e5b404b66aedd155a584 Mon Sep 17 00:00:00 2001
From: Kyle Harding <kyle@balena.io>
Date: Tue, 19 Dec 2023 18:15:38 -0500
Subject: [PATCH 2/2] Remove repo config from flowzone.yml

This functionality is being deprecated in Flowzone.

See: https://github.com/product-os/flowzone/pull/833

Change-type: patch
Signed-off-by: Kyle Harding <kyle@balena.io>
---
 .github/workflows/flowzone.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 0883217c..3653da56 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -1,5 +1,4 @@
 name: Flowzone
-
 on:
   pull_request:
     types: [opened, synchronize, closed]
@@ -8,7 +7,6 @@ on:
   pull_request_target:
     types: [opened, synchronize, closed]
     branches: [main, master]
-
 jobs:
   flowzone:
     name: Flowzone
@@ -23,8 +21,4 @@ jobs:
       tests_run_on: '["ubuntu-20.04","macos-latest","windows-2019"]'
       restrict_custom_actions: false
       github_prerelease: true
-      repo_config: true
-      repo_description: "Flash OS images to SD cards & USB drives, safely and easily."
-      repo_homepage: https://etcher.io/
-      repo_enable_wiki: true
       cloudflare_website: "etcher"