From c31577d102d87455f3f12086be4c0e2159fa5d35 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 8 Apr 2024 11:27:11 -0400
Subject: build: Add a separate configuration step

---
 .github/workflows/ci.yml      | 23 ++++++++++++++---------
 .github/workflows/codecov.yml |  3 ++-
 .github/workflows/codeql.yml  |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51d06fb..78aa196 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,12 +53,13 @@ jobs:
         run: |
           brew install \
               bash \
-              expect
+              expect \
+              make
 
       - name: Run tests
         run: |
           jobs=$(sysctl -n hw.ncpu)
-          make -j$jobs distcheck
+          gmake -j$jobs distcheck
 
   freebsd:
     name: FreeBSD
@@ -79,8 +80,8 @@ jobs:
             pkg install -y \
                 bash \
                 expect \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-wrapper
             pw useradd -n action -m -G wheel -s /usr/local/bin/bash
@@ -89,7 +90,7 @@ jobs:
 
           run: |
             chown -R action:action .
-            sudo -u action gmake -j$(nproc) distcheck
+            sudo -u action make -j$(nproc) distcheck
 
   openbsd:
     name: OpenBSD
@@ -119,6 +120,7 @@ jobs:
           run: |
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
+            doas -u action gmake config
             doas -u action gmake -j$jobs check TEST_FLAGS="--sudo=doas --verbose=skipped"
 
   netbsd:
@@ -141,8 +143,8 @@ jobs:
             pkg_add \
                 bash \
                 clang \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-expect
             useradd -m -G wheel -g =uid action
@@ -152,7 +154,8 @@ jobs:
             PATH="/sbin:/usr/sbin:$PATH"
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            sudo -u action gmake -j$jobs check CC=clang LDFLAGS="-rpath /usr/pkg/lib" TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action make config CC=clang
+            sudo -u action make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   dragonflybsd:
     name: DragonFly BSD
@@ -173,8 +176,8 @@ jobs:
             pkg install -y \
                 bash \
                 expect \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-wrapper
             pw useradd -n action -m -G wheel -s /usr/local/bin/bash
@@ -183,7 +186,8 @@ jobs:
           run: |
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action make config
+            sudo -u action make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   omnios:
     name: OmniOS
@@ -215,4 +219,5 @@ jobs:
             PATH="/usr/xpg4/bin:$PATH"
             chown -R action:staff .
             jobs=$(getconf NPROCESSORS_ONLN)
-            sudo -u action gmake -j$jobs check LDFLAGS="-Wl,-rpath,/opt/ooce/lib/amd64" TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action gmake config
+            sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index d1dc351..2abe531 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -25,7 +25,8 @@ jobs:
 
       - name: Generate coverage
         run: |
-          make -j$(nproc) gcov check TEST_FLAGS="--sudo"
+          make config GCOV=y
+          make -j$(nproc) check TEST_FLAGS="--sudo"
           gcov -abcfpu obj/*/*.o
 
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c50b266..a2c224a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,6 +47,7 @@ jobs:
 
       - name: Build
         run: |
+          make config
           make -j$(nproc) all
 
       - name: Perform CodeQL Analysis
-- 
cgit v1.2.3