fix workflows

SOELTH · Apr 18, 2023 · 2c108b2 · 2c108b2
1 parent dd6758d
commit 2c108b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/make_build.yml b/.github/workflows/make_build.yml
@@ -13,12 +13,16 @@ jobs:
     runs-on: [self-hosted, Linux, X64]
     defaults:
       run:
-        shell: nix-shell --pure --keep MACHINE --keep EXTRAS --run "bash --noprofile --norc -eo pipefail {0}"
+        shell: bash --noprofile --norc -eo pipefail -c "set -ex; source /home/runner/firedancer-opts/activate-opt && echo `pwd` && ls -lah {0} && chmod +x {0} && {0}"
+
     env:
       MACHINE: linux_${{ matrix.compiler }}_x86_64
       EXTRAS: libbpf
     steps:
       - uses: actions/checkout@v3
+
+      - name: Copy prebuilt deps
+        run: "cp -r /home/runner/firedancer-opts/opt . && ls -lah opt"
 
       - name: Build everything
         run: make -j
diff --git a/.github/workflows/make_coverage.yml b/.github/workflows/make_coverage.yml
@@ -10,13 +10,16 @@ jobs:
     runs-on: [self-hosted, Linux, X64]
     defaults:
       run:
-        shell: nix-shell --pure --keep MACHINE --keep EXTRAS --run "bash --noprofile --norc -eo pipefail {0}"
+        shell: bash --noprofile --norc -eo pipefail -c "set -ex; source /home/runner/firedancer-opts/activate-opt && chmod +x {0} && {0}"
     env:
       MACHINE: linux_clang_x86_64
       EXTRAS: libbpf llvm-cov
     steps:
       - uses: actions/checkout@v3
 
+      - name: Copy prebuilt deps
+        run: "cp -r /home/runner/firedancer-opts/opt . && ls -lah opt"
+
       - name: Build everything
         run: make -j
 

diff --git a/.github/workflows/make_test.yml b/.github/workflows/make_test.yml
@@ -10,12 +10,15 @@ jobs:
     runs-on: [self-hosted, Linux, X64]
     defaults:
       run:
-        shell: nix-shell --pure --keep MACHINE --keep EXTRAS --run "bash --noprofile --norc -eo pipefail {0}"
+        shell: bash --noprofile --norc -eo pipefail -c "set -ex; source /home/runner/firedancer-opts/activate-opt && chmod +x {0} && {0}"
     env:
       EXTRAS: libbpf
     steps:
       - uses: actions/checkout@v3
 
+      - name: Copy prebuilt deps
+        run: "cp -r /home/runner/firedancer-opts/opt . && ls -lah opt"
+
       - name: Build everything
         run: make -j