A little tidy up

Author: Stringy

.github/workflows/ci.yml

@@ -90,26 +90,28 @@ jobs:
 
     - run: docker push "$(make image-name)"
 
-  tag:
+  vars:
     runs-on: ubuntu-24.04
     outputs:
-      tag: ${{ steps.tag.outputs.tag }}
-      image-name: ${{ steps.image-name.outputs.image-name }}
+      tag: ${{ steps.vars.outputs.tag }}
+      image-name: ${{ steps.vars.outputs.image-name }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - id: tag
-      run: echo "tag=$(make tag)" >> "$GITHUB_OUTPUT"
 
-    - id: image-name
-      run: echo "image-name=$(make image-name)" >> "$GITHUB_OUTPUT"
+    - id: vars
+      run: |
+        {
+          echo "tag=$(make tag)"
+          echo "image-name=$(make image-name)"
+        } >> "$GITHUB_OUTPUT"
 
   manifest:
     runs-on: ubuntu-24.04
     needs:
       - container
-      - tag
+      - vars
     env:
       ARCHS: amd64 arm64
     steps:
@@ -127,15 +129,14 @@ jobs:
 
       - uses: ./collector/.github/actions/create-multiarch-manifest
         with:
-          base-image: ${{ needs.tag.outputs.image-name }}
+          base-image: ${{ needs.vars.outputs.image-name }}
           archs: ${{ env.ARCHS }}
 
   integration-tests:
     needs:
-      - container
-      - tag
+      - vars
       - manifest
     uses: ./.github/workflows/integration-tests.yml
     with:
-      tag: ${{ needs.tag.outputs.tag }}
+      tag: ${{ needs.vars.outputs.tag }}
     secrets: inherit

fact/build.rs

@@ -5,11 +5,14 @@ use std::{
     process::Command,
 };
 
-fn compile_bpf(out_dir: &Path) -> anyhow::Result<()> {
+fn compile_bpf(out_dir: &Path, arch: &str) -> anyhow::Result<()> {
     let obj = match out_dir.join("main.o").into_os_string().into_string() {
         Ok(s) => s,
         Err(os_string) => anyhow::bail!("Failed to convert path to string {:?}", os_string),
     };
+
+    let target_arch = format!("-D__TARGET_ARCH_{}", arch);
+
     match Command::new("clang")
         .args([
             "-target",
@@ -19,7 +22,7 @@ fn compile_bpf(out_dir: &Path) -> anyhow::Result<()> {
             "-c",
             "-Wall",
             "-Werror",
-            &format!("-D__TARGET_ARCH_{}", env::var("CARGO_CFG_TARGET_ARCH")?),
+            &target_arch,
             "../fact-ebpf/main.c",
             "-o",
             &obj,
@@ -52,6 +55,7 @@ fn main() -> anyhow::Result<()> {
     let out_dir: PathBuf = env::var("OUT_DIR")
         .context("Failed to interpret OUT_DIR environment variable")?
         .into();
-    compile_bpf(&out_dir).context("Failed to compile eBPF")?;
+    let arch = env::var("CARGO_CFG_TARGET_ARCH")?;
+    compile_bpf(&out_dir, &arch).context("Failed to compile eBPF")?;
     generate_bindings(&out_dir)
 }

fact/src/event.rs

@@ -1,5 +1,6 @@
 use std::{
     ffi::CStr,
+    os::raw::c_char,
     path::PathBuf,
     time::{SystemTime, UNIX_EPOCH},
 };
@@ -12,7 +13,7 @@ use crate::{
     host_info,
 };
 
-fn slice_to_string(s: &[std::os::raw::c_char]) -> anyhow::Result<String> {
+fn slice_to_string(s: &[c_char]) -> anyhow::Result<String> {
     Ok(unsafe { CStr::from_ptr(s.as_ptr()) }.to_str()?.to_owned())
 }