From ffcb2d957ecc91f2db42180d635860ef0c03ad4b Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Sat, 20 Jul 2024 19:07:58 +0200
Subject: [PATCH] feat: include ${{ runner.arch }} in cache keys

---
 .github/actions/internal/install-haxelibs/action.yml | 2 +-
 .github/actions/internal/setup-cs/action.yml         | 2 +-
 .github/actions/internal/setup-flash/action.yml      | 2 +-
 .github/actions/internal/setup-hashlink/action.yml   | 2 +-
 .github/actions/internal/setup-lua/action.yml        | 2 +-
 .github/actions/internal/setup-neko/action.yml       | 2 +-
 .github/actions/setup-haxe/action.yml                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/internal/install-haxelibs/action.yml b/.github/actions/internal/install-haxelibs/action.yml
index 0a44061..9e18b5e 100644
--- a/.github/actions/internal/install-haxelibs/action.yml
+++ b/.github/actions/internal/install-haxelibs/action.yml
@@ -25,7 +25,7 @@ runs:
         path: |
           ${{ runner.tool_cache }}/haxe/lib
         # repo layout between haxe3 and 4 changed (and may change again) so we cache based on haxe version
-        key: ${{ runner.os }}-haxelibs-${{ inputs.haxe-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-haxelibs-${{ inputs.haxe-version }}
 
     - name: "Haxe Libs Cache: Init Root Path"
       id: HAXE-TARGETS-CACHE
diff --git a/.github/actions/internal/setup-cs/action.yml b/.github/actions/internal/setup-cs/action.yml
index 25871b8..0b36de2 100644
--- a/.github/actions/internal/setup-cs/action.yml
+++ b/.github/actions/internal/setup-cs/action.yml
@@ -22,7 +22,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ inputs.cache-folder }}
-        key: ${{ runner.os }}-mono-${{ inputs.mono-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-mono-${{ inputs.mono-version }}
 
     - name: "Setup C#: Install Mono"
       shell: bash
diff --git a/.github/actions/internal/setup-flash/action.yml b/.github/actions/internal/setup-flash/action.yml
index a4d9acb..9545d1a 100644
--- a/.github/actions/internal/setup-flash/action.yml
+++ b/.github/actions/internal/setup-flash/action.yml
@@ -29,7 +29,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ inputs.cache-folder }}
-        key: ${{ runner.os }}-flash-${{ inputs.flash-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-flash-${{ inputs.flash-version }}
 
     - name: "Setup Flash: Install Binaries"
       id: INSTALL-FLASH
diff --git a/.github/actions/internal/setup-hashlink/action.yml b/.github/actions/internal/setup-hashlink/action.yml
index d6a49f9..f2ce759 100644
--- a/.github/actions/internal/setup-hashlink/action.yml
+++ b/.github/actions/internal/setup-hashlink/action.yml
@@ -18,7 +18,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ inputs.cache-folder }}
-        key: ${{ runner.os }}-hashlink-latest
+        key: ${{ runner.os }}-${{ runner.arch }}-hashlink-latest
 
     - name: "Setup Hashlink: Install Binaries"
       shell: bash
diff --git a/.github/actions/internal/setup-lua/action.yml b/.github/actions/internal/setup-lua/action.yml
index ea90ea5..875eb2d 100644
--- a/.github/actions/internal/setup-lua/action.yml
+++ b/.github/actions/internal/setup-lua/action.yml
@@ -24,7 +24,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ inputs.cache-folder }}
-        key: ${{ runner.os }}-lua-${{ inputs.lua-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-lua-${{ inputs.lua-version }}
 
     - name: "Enable MSYS2 bash" # https://github.com/actions/runner/issues/497
       if: ${{ runner.os == 'Windows' }}
diff --git a/.github/actions/internal/setup-neko/action.yml b/.github/actions/internal/setup-neko/action.yml
index ad37372..5b9b2ad 100644
--- a/.github/actions/internal/setup-neko/action.yml
+++ b/.github/actions/internal/setup-neko/action.yml
@@ -18,7 +18,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ runner.temp }}/haxe/targets/neko-${{ inputs.neko-version }}
-        key: ${{ runner.os }}-neko-${{ inputs.neko-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-neko-${{ inputs.neko-version }}
 
     - name: "Setup Neko: Install Binaries"
       shell: bash
diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml
index eda3227..0510523 100644
--- a/.github/actions/setup-haxe/action.yml
+++ b/.github/actions/setup-haxe/action.yml
@@ -59,7 +59,7 @@ runs:
       uses: actions/cache@v4 # https://github.com/actions/cache
       with:
         path: ${{ runner.temp }}/haxe/sdk/haxe-${{ inputs.haxe-version }}
-        key: ${{ runner.os }}-haxe-${{ inputs.haxe-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-haxe-${{ inputs.haxe-version }}
 
     - name: "Setup Haxe: Install Binaries"
       shell: bash