WIP: ci: get stress-ng and bpf clang from pinned nixpkgs

sched-ext · Nov 26, 2024 · 7113936 · 7113936
1 parent c15d9ea
commit 7113936
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/actions/install-deps-action/action.yml b/.github/actions/install-deps-action/action.yml
@@ -15,6 +15,13 @@ runs:
 
     ### DOWNLOAD AND INSTALL DEPENDENCIES ###
 
+    # Get some packages from nixpkgs for newer revisions
+    - uses: DeterminateSystems/nix-installer-action@main
+    - run: |
+        nix registry add nixpkgs github:NixOS/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d
+        echo "BPF_CLANG=$(nix build --print-out-paths --no-link nixpkgs#clang)/bin/clang" >> $GITHUB_ENV
+      shell: bash
+
     # Download dependencies packaged by Ubuntu
     - run: |
         sudo apt install -f -y bison busybox-static cmake coreutils \

diff --git a/.github/workflows/caching-build.yml b/.github/workflows/caching-build.yml
@@ -144,7 +144,7 @@ jobs:
       - run: sudo chmod +x /usr/bin/veristat && sudo chmod 755 /usr/bin/veristat
 
       # The actual build:
-      - run: meson setup build -Dkernel=../linux/arch/x86/boot/bzImage -Dkernel_headers=../linux -Denable_stress=true -Dvng_rw_mount=true
+      - run: meson setup build -Dkernel=../linux/arch/x86/boot/bzImage -Dkernel_headers=../linux -Denable_stress=true -Dvng_rw_mount=true -Dbpf_clang="$BPF_CLANG"
       - run: meson compile -C build ${{ matrix.scheduler }}
 
       # Print CPU model before running the tests (this can be useful for