From bcbceb13f86364a5ffb344bc6568b694888f4773 Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 20 Apr 2023 14:41:37 -0600
Subject: [PATCH] github-ci: update non-root build to Fedora 37

As Fedora 36 will be EOL in a month.
---
 .github/workflows/builds.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 004b408c57..9b0ae8bed0 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -336,10 +336,10 @@ jobs:
         run: cargo clippy --all-features
         working-directory: rust
 
-  # This build also creates the distribution package that some other builds
-  # depend on.
+  # AlmaLinux 8 builder and distribution archive builder that some
+  # other builds will depend on.
   almalinux-8:
-    name: AlmaLinux 8
+    name: AlmaLinux 8 (Dist builder)
     runs-on: ubuntu-latest
     container: almalinux:8
     needs: [prepare-deps, prepare-cbindgen]
@@ -1221,17 +1221,21 @@ jobs:
       - run: suricata-update -V
       - run: suricatasc -h
 
-  fedora-36-non-root:
-    name: Fedora 36 (non-root, debug, clang, asan, wshadow, rust-strict, systemd)
+  # This job builds and tests Suricata as a non-root user as some
+  # issues only show up when not running as root, and by default all
+  # jobs in GitHub actions are run as root inside the container.
+  fedora-37-non-root:
+    name: Fedora 37 (non-root, debug, clang, asan, wshadow, rust-strict, systemd)
     runs-on: ubuntu-latest
-    container: fedora:36
-    needs: [prepare-deps, prepare-cbindgen]
+    container: fedora:37
+    needs: [prepare-deps]
     steps:
       - run: |
           dnf -y install \
                 autoconf \
                 automake \
                 cargo \
+                cbindgen \
                 ccache \
                 clang \
                 diffutils \
@@ -1277,13 +1281,6 @@ jobs:
       - run: cp -a . /home/suricata/suricata
       - run: chown -R suricata:suricata /home/suricata
 
-      - run: sudo -u suricata -s mkdir -p .cargo/bin
-        working-directory: /home/suricata
-      - run: sudo -u suricata -s cp suricata/prep/cbindgen .cargo/bin
-        working-directory: /home/suricata
-      - run: sudo -u suricata -s chmod 755 .cargo/bin/cbindgen
-        working-directory: /home/suricata
-
       - run: sudo -u suricata -s ./autogen.sh
         working-directory: /home/suricata/suricata