x

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola · Feb 13, 2024 · 0d8e13b · 0d8e13b
1 parent 7fca197
commit 0d8e13b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git 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
+          wait-timeout-minutes: 5
diff --git 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
@@ -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