From 05d7ef506fce49fdba00242f22afcc26bf617cef Mon Sep 17 00:00:00 2001
From: Juan P Lopez <dolcalmi@gmail.com>
Date: Thu, 17 Oct 2024 17:22:50 -0500
Subject: [PATCH] fix: flake nix location

---
 .github/workflows/e2e-test.yml | 47 +++++++++-------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 580219629e..7ce037f09e 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -1,51 +1,36 @@
-name: "E2E Test"
+name: "E2e test"
 
 on:
   pull_request:
     branches: [main]
 
-env:
-  NIX_CACHE_DIR: ~/.cache/nix
-  BUCK2_CACHE_DIR: ~/.cache/buck2
-
 jobs:
   tests:
-    name: Execute via bats
+    name: execute via bats
     runs-on: ubuntu-latest
     timeout-minutes: 30
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Maximize build space
         uses: easimon/maximize-build-space@master
         with:
           root-reserve-mb: 12288
           temp-reserve-mb: 12288
+      - uses: actions/checkout@v4
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@v14
 
-      - name: Cache Nix store
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.NIX_CACHE_DIR }}
-          key: ${{ runner.os }}-nix-${{ hashFiles('**/flake.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-nix-
+      - name: Run the Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v8
 
       - name: Cache Buck2 artifacts
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
-          path: ${{ env.BUCK2_CACHE_DIR }}
-          key: ${{ runner.os }}-buck2-${{ hashFiles('**/BUCK') }}
+          path: ~/.cache/buck2
+          key: ${{ runner.os }}-buck2-${{ hashFiles('**/BUCK', '**/BUCK.build', '**/flake.lock') }}
           restore-keys: |
             ${{ runner.os }}-buck2-
 
-      - name: Run the Magic Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
-
       - name: Buck2 build
         run: |
           nix develop --command buck2 build \
@@ -63,23 +48,15 @@ jobs:
 
       - name: Run bats tests
         run: |
-          nix develop --command bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/**
+          nix develop -c bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/**
 
-      - name: Rename and upload Tilt log
+      - name: Rename Tilt log
         if: always()
-        run: |
-          mv bats/.e2e-tilt.log bats/e2e-tilt.log
+        run: mv bats/.e2e-tilt.log bats/e2e-tilt.log
 
       - name: Upload Tilt log
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: tilt-log
+          name: Tilt log
           path: bats/e2e-tilt.log
-
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-results
-          path: bats/test-results