From 63c0a5206749e34f6b37065dc2870eac51a0acde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Stefanik?= <netrolller.3d@gmail.com>
Date: Mon, 25 Dec 2023 11:09:51 +0100
Subject: [PATCH] Fix external & distfiles directory paths for CI

---
 .github/workflows/bwrap.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bwrap.yml b/.github/workflows/bwrap.yml
index 37de45d..8d40f8b 100644
--- a/.github/workflows/bwrap.yml
+++ b/.github/workflows/bwrap.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Get sources
         if: steps.cache.outputs.cache-hit != 'true'
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass1
@@ -83,7 +83,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Get sources
         if: steps.cache.outputs.cache-hit != 'true'
@@ -93,7 +93,7 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass2
@@ -102,7 +102,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: internal_packages_pass2
-          path: tmp/externals/repo/**
+          path: tmp/external/repo/**
 
   pass3:
     name: Run remaining builds under bubblewrap
@@ -129,13 +129,13 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: internal_packages_pass2
-          path: tmp/externals/repo-preseeded/
+          path: tmp/external/repo-preseeded/
       - name: Query cache for sources
         id: cache
         uses: actions/cache/restore@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Get sources
         if: steps.cache.outputs.cache-hit != 'true'
@@ -145,7 +145,7 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: |
-            externals/distfiles
+            distfiles
           key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass3
@@ -154,4 +154,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: packages
-          path: tmp/externals/repo/**
+          path: tmp/external/repo/**