From 3f68f8a0765e0f0e13726c12df15b18d76d95b17 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 11 Sep 2024 11:05:18 +0900
Subject: [PATCH 1/2] Update actions/cache to v4

---
 .github/workflows/lint-and-test.yml         | 2 +-
 .github/workflows/nightly-modpack-build.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index f1c210a6..bdcbfa28 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -26,7 +26,7 @@ jobs:
       # load cached venv if cache exists
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
diff --git a/.github/workflows/nightly-modpack-build.yml b/.github/workflows/nightly-modpack-build.yml
index d9026308..0d636d9d 100644
--- a/.github/workflows/nightly-modpack-build.yml
+++ b/.github/workflows/nightly-modpack-build.yml
@@ -36,7 +36,7 @@ jobs:
       # load cached venv if cache exists
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
@@ -59,7 +59,7 @@ jobs:
 
       - name: Load cached mod zips
         id: load_cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: cache
           key: daxxl-${{ runner.os }}-${{ steps.date.outputs.cachedate }}
@@ -76,7 +76,7 @@ jobs:
           poetry run python -m gtnh.cli.assemble_nightly
 
       - name: Save cached mod zips
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: success() || failure()
         with:
           path: cache

From 8d6c1cd611904bbb7521af1e446f034b5dc1c4c1 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 11 Sep 2024 11:05:33 +0900
Subject: [PATCH 2/2] Fix cache fail

---
 .github/workflows/nightly-modpack-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly-modpack-build.yml b/.github/workflows/nightly-modpack-build.yml
index 0d636d9d..461fb13b 100644
--- a/.github/workflows/nightly-modpack-build.yml
+++ b/.github/workflows/nightly-modpack-build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('poetry.lock', '*/poetry.lock') }}
 
       # install dependencies if cache does not exist
       - name: Install dependencies