From 9cb3c066d63633f42fca83a9aaef9d49b33a94c4 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <shartte@users.noreply.github.com>
Date: Sun, 24 Dec 2023 21:52:45 +0100
Subject: [PATCH] Update to artifact up-/download v4 and fix guide export on
 release.

---
 .github/workflows/build.yml        |  4 ++--
 .github/workflows/export_guide.yml | 10 +++++-----
 .github/workflows/release.yml      | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20d075031d9..9ac2a136f9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,13 +55,13 @@ jobs:
         if: success() || failure()
         run: npx junit-report-merger junit.xml "**/TEST-*.xml"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: test-results
           path: junit.xml
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: build/libs/
diff --git a/.github/workflows/export_guide.yml b/.github/workflows/export_guide.yml
index 87d5bde2a42..46b393d2e52 100644
--- a/.github/workflows/export_guide.yml
+++ b/.github/workflows/export_guide.yml
@@ -35,7 +35,7 @@ jobs:
           rm -f build/guide/guide.*.json
       - name: Compress guide files before upload as artifact
         run: tar cf guide.tar build/guide/
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: guide
           path: guide.tar
@@ -48,11 +48,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: download
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: guide
       - name: Decompress guide tar
-        run: tar xf ${{steps.download.outputs.download-path}}
+        run: tar xf ${{steps.download.outputs.download-path}}/guide.tar
       - name: Create ZIP
         working-directory: build/guide
         run: zip -r ../../guide-assets.zip .
@@ -72,7 +72,7 @@ jobs:
     environment: Production
     if: startsWith(github.ref, 'refs/tags/neoforge/v')
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: guide
       - name: Decompress guide tar
@@ -112,7 +112,7 @@ jobs:
     environment: Production
     if: github.ref == 'refs/heads/main' && (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: guide
       - name: Decompress guide tar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bc2f22cd97c..257878ae4bf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         # It is important to  archive .gradle as well since gradle stores the incremental build state there
         run: tar -I zstd -cf build.tar.zst .gradle build src/generated
       - name: Upload build and gradle folders
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: build.tar.zst
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
       - name: Unpack build artifact
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/gradle-setup
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
       - name: Unpack build artifact
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
       - name: Unpack build artifact
@@ -148,7 +148,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/gradle-setup
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
       - name: Unpack build artifact
@@ -167,7 +167,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
       - name: Unpack build artifact