Cleanup/Misc changes from PR review

Co-authored-by: Mauro Ezequiel Moltrasio <[email protected]>

Author: Stringy

.github/workflows/ci.yml

@@ -63,22 +63,40 @@ jobs:
         key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ steps.args.outputs.args }}-${{ hashFiles('**/Cargo.lock') }}
     - run: cargo ${{ matrix.args }}
 
+  vars:
+    runs-on: ubuntu-24.04
+    outputs:
+      tag: ${{ steps.vars.outputs.tag }}
+      image-name: ${{ steps.vars.outputs.image-name }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - id: vars
+      run: |
+        cat << EOF >> "$GITHUB_OUTPUT"
+        tag=$(make tag)
+        image-name=$(make image-name)
+        EOF
+
   container:
+    needs:
+      - vars
     strategy:
       fail-fast: false
       matrix:
         arch:
           - amd64
           - arm64
     runs-on: ${{ (matrix.arch == 'arm64' && 'ubuntu-24.04-arm') || 'ubuntu-24.04' }}
+    env:
+      FACT_TAG: ${{ needs.vars.outputs.tag }}-${{ matrix.arch }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - run: |
-        echo "FACT_TAG=$(make tag)-${{ matrix.arch }}" >> "$GITHUB_ENV"
-
     - run: make image
 
     - name: Login to quay.io/stackrox-io
@@ -90,23 +108,6 @@ jobs:
 
     - run: docker push "$(make image-name)"
 
-  vars:
-    runs-on: ubuntu-24.04
-    outputs:
-      tag: ${{ steps.vars.outputs.tag }}
-      image-name: ${{ steps.vars.outputs.image-name }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - id: vars
-      run: |
-        {
-          echo "tag=$(make tag)"
-          echo "image-name=$(make image-name)"
-        } >> "$GITHUB_OUTPUT"
-
   manifest:
     runs-on: ubuntu-24.04
     needs:

.github/workflows/integration-tests.yml

@@ -18,7 +18,7 @@ on:
         type: string
         default: ''
 
-      # this is temporary, will be removed once Konflux builds have been
+      # TODO: Remove once Konflux builds have been
       # modified to support Arm
       vm_list:
         description: JSON list of VMs to test on

fact/build.rs

@@ -5,13 +5,13 @@ use std::{
     process::Command,
 };
 
-fn compile_bpf(out_dir: &Path, arch: &str) -> anyhow::Result<()> {
+fn compile_bpf(out_dir: &Path) -> 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);
+    let target_arch = format!("-D__TARGET_ARCH_{}", env::var("CARGO_CFG_TARGET_ARCH")?);
 
     match Command::new("clang")
         .args([
@@ -55,7 +55,6 @@ fn main() -> anyhow::Result<()> {
     let out_dir: PathBuf = env::var("OUT_DIR")
         .context("Failed to interpret OUT_DIR environment variable")?
         .into();
-    let arch = env::var("CARGO_CFG_TARGET_ARCH")?;
-    compile_bpf(&out_dir, &arch).context("Failed to compile eBPF")?;
+    compile_bpf(&out_dir).context("Failed to compile eBPF")?;
     generate_bindings(&out_dir)
 }