From 3dae99d86a72155b552fb47854067459e1f65480 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 10 Jun 2023 12:53:21 +0200
Subject: [PATCH] ci: add runner image version to cache key

This will ensure the cache isn't used when an image upgrade changes the
compiler version, causing the build to fail.

(cherry picked from commit dd6b6f185bb7ffa3cb9e3fb40a4d5e2806a73257)
---
 .github/actions/cache/action.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index 9ad14b8c27..e7ffdd66b6 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -10,6 +10,10 @@ runs:
       run: echo "CACHE_KEY=$CACHE_KEY-${{ join(matrix.*, '-') }}" >> $GITHUB_ENV
       shell: bash
 
+    - id: image
+      run: echo "version=$ImageVersion" >> $GITHUB_OUTPUT
+      shell: bash
+
     # Avoid using '**/CMakeLists.txt' (or any pattern starting with '**/') even
     # if it makes the expression below simpler. hashFiles() has a timer that
     # will fail the job if it times out, which can happen if there are too many
@@ -17,6 +21,6 @@ runs:
     - uses: actions/cache@v3
       with:
         path: .deps
-        key: ${{ env.CACHE_KEY }}-${{ hashFiles('cmake**',
+        key: ${{ env.CACHE_KEY }}-${{ steps.image.outputs.version }}-${{ hashFiles('cmake**',
           '.github/workflows/test.yml', 'CMakeLists.txt',
           'runtime/CMakeLists.txt', 'src/nvim/**/CMakeLists.txt') }}