From 2f599a4dd94416ff8355919b51a4b1838ce289da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:04:50 +0000
Subject: [PATCH 1/3] Bump actions/download-artifact from 3 to 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test_fast.yml       | 2 +-
 .github/workflows/test_functional.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
index 6530bb85cd6..e954d6ea598 100644
--- a/.github/workflows/test_fast.yml
+++ b/.github/workflows/test_fast.yml
@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Codecov upload
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
index 6fad4147345..e200aae156c 100644
--- a/.github/workflows/test_functional.yml
+++ b/.github/workflows/test_functional.yml
@@ -312,7 +312,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Codecov upload
         uses: codecov/codecov-action@v3

From 58b76079d02f5b897f41610a7fc966bcbd2a00f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:04:52 +0000
Subject: [PATCH 2/3] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/bash.yml            | 2 +-
 .github/workflows/test_fast.yml       | 4 ++--
 .github/workflows/test_functional.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bash.yml b/.github/workflows/bash.yml
index 4d740df23ac..e7daf22be59 100644
--- a/.github/workflows/bash.yml
+++ b/.github/workflows/bash.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Upload artifact
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Upload cylc-run artifact
           path: cylc-run
diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
index 6530bb85cd6..5c0c9ead20d 100644
--- a/.github/workflows/test_fast.yml
+++ b/.github/workflows/test_fast.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Upload failed tests artifact
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cylc-run (${{ matrix.os }} py-${{ matrix.python-version }})
           path: ~/cylc-run/
@@ -81,7 +81,7 @@ jobs:
           coverage report
 
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_${{ matrix.os }}_py-${{ matrix.python-version }}
           path: coverage.xml
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
index 6fad4147345..e284a9906b1 100644
--- a/.github/workflows/test_functional.yml
+++ b/.github/workflows/test_functional.yml
@@ -259,7 +259,7 @@ jobs:
 
       - name: Upload failed tests artifact
         if: failure() && steps.test.outcome == 'failure'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cylc-run (${{ steps.uploadname.outputs.uploadname }})
           path: ~/cylc-run/
@@ -297,7 +297,7 @@ jobs:
           coverage report
 
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_${{ steps.uploadname.outputs.uploadname }}
           path: coverage.xml

From b878692950bb9af93b87359d2898f91fddb924a3 Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:10:00 +0000
Subject: [PATCH 3/3] GH Actions artifact name fixes

---
 .github/workflows/bash.yml            | 2 +-
 .github/workflows/test_functional.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/bash.yml b/.github/workflows/bash.yml
index e7daf22be59..eb34e3ad76d 100644
--- a/.github/workflows/bash.yml
+++ b/.github/workflows/bash.yml
@@ -87,5 +87,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: Upload cylc-run artifact
+          name: 'cylc-run (bash-${{ matrix.bash-version }})'
           path: cylc-run
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
index e284a9906b1..35c01ba7f2f 100644
--- a/.github/workflows/test_functional.yml
+++ b/.github/workflows/test_functional.yml
@@ -251,6 +251,7 @@ jobs:
               -exec echo '====== {} ======' \; -exec cat '{}' \;
 
       - name: Set artifact upload name
+        if: always()
         id: uploadname
         run: |
           # artifact name cannot contain '/' characters