From 0d8e13bf2e13008102e8e067da8b256d4a21f74b Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Tue, 13 Feb 2024 14:50:50 -0800
Subject: [PATCH] x

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/install.yaml         | 15 +++++++++------
 .github/workflows/nightly-install.yaml | 13 ++++++++-----
 .github/workflows/snapshotter.yaml     | 15 ++++++++++-----
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
index 0802d16e73db..062c860f72d9 100644
--- a/.github/workflows/install.yaml
+++ b/.github/workflows/install.yaml
@@ -44,14 +44,17 @@ jobs:
         continue-on-error: true
       - name: Set up vagrant and libvirt
         uses: ./.github/actions/vagrant-setup
-      - name: Open permissions of vagrant cache folders
-        run: sudo chmod -R 777 /root/.vagrant.d
+        # Workaround for https://github.com/actions/cache/issues/1319
+      - name: Setup vagrant cache links
+        run: |
+          sudo chmod -R 777 /root/.vagrant.d
+          sudo ln -s /root/.vagrant.d/ /tmp/cache-vagrant
       - name: "Vagrant Cache"
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
-            /root/.vagrant.d/boxes
-            /root/.vagrant.d/gems
+            /tmp/cache-vagrant/boxes
+            /tmp/cache-vagrant/gems
           key: vagrant-box-${{ matrix.vm }}
       - name: "Vagrant Plugin(s)"
         run: sudo vagrant plugin install vagrant-k3s vagrant-reload vagrant-scp
@@ -100,4 +103,4 @@ jobs:
         if: ${{ failure() }}
         with:
           ## If no one connects after 5 minutes, shut down server.
-          wait-timeout-minutes: 5
\ No newline at end of file
+          wait-timeout-minutes: 5
diff --git a/.github/workflows/nightly-install.yaml b/.github/workflows/nightly-install.yaml
index 056602aab879..e51f05b93403 100644
--- a/.github/workflows/nightly-install.yaml
+++ b/.github/workflows/nightly-install.yaml
@@ -30,14 +30,17 @@ jobs:
         continue-on-error: true
       - name: Set up vagrant and libvirt
         uses: ./.github/actions/vagrant-setup
-      - name: Open permissions of vagrant cache folders
-        run: sudo chmod -R 777 /root/.vagrant.d
+        # Workaround for https://github.com/actions/cache/issues/1319
+      - name: Setup vagrant cache links
+        run: |
+          sudo chmod -R 777 /root/.vagrant.d
+          sudo ln -s /root/.vagrant.d/ /tmp/cache-vagrant
       - name: "Vagrant Cache"
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
-            /root/.vagrant.d/boxes
-            /root/.vagrant.d/gems
+            /tmp/cache-vagrant/boxes
+            /tmp/cache-vagrant/gems
           key: vagrant-box-${{ matrix.vm }}
         id: vagrant-cache
       - name: "Vagrant Plugin(s)"
diff --git a/.github/workflows/snapshotter.yaml b/.github/workflows/snapshotter.yaml
index 18b21a7674ab..91ca54e5b354 100644
--- a/.github/workflows/snapshotter.yaml
+++ b/.github/workflows/snapshotter.yaml
@@ -52,14 +52,19 @@ jobs:
         continue-on-error: true
       - name: Set up vagrant and libvirt
         uses: ./.github/actions/vagrant-setup
-      - name: Open permissions of vagrant cache folders
-        run: sudo chmod -R 777 /root/.vagrant.d
+        # Workaround for https://github.com/actions/cache/issues/1319
+      - name: Setup vagrant cache links
+        run: |
+          sudo chmod -R 777 /root/.vagrant.d
+          sudo ln -s /root/.vagrant.d/ /tmp/cache-vagrant
+          stat -c "%a %n" /tmp/my-vagrant/* /tmp/my-vagrant
+          stat -c "%a %n" /root/.vagrant.d/* /root/.vagrant.d
       - name: "Vagrant Cache"
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
-            /root/.vagrant.d/boxes
-            /root/.vagrant.d/gems
+            /tmp/cache-vagrant/boxes
+            /tmp/cache-vagrant/gems
           key: vagrant-box-${{ matrix.vm }}
       - name: "Vagrant Plugin(s)"
         run: sudo vagrant plugin install vagrant-k3s