From c0b9d4923693d81823807064e0a0b152b3c6b141 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 3 Jul 2024 19:10:10 -0700
Subject: [PATCH 1/3] njs: don't use a special runner definition for
 debian12-x86 build

---
 .github/workflows/njs-buildbot.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/njs-buildbot.yml b/.github/workflows/njs-buildbot.yml
index 468b462..84b89fc 100644
--- a/.github/workflows/njs-buildbot.yml
+++ b/.github/workflows/njs-buildbot.yml
@@ -38,6 +38,7 @@ jobs:
       matrix:
         os: [ alpine-3.19, amazonlinux-2, amazonlinux-2023, debian-11, debian-12, freebsd-14, rhel-7, rhel-8, rhel-9, sles-12, ubuntu-20.04, ubuntu-22.04, ubuntu-23.10 ]
         arch: [ amd64, arm64 ]
+        subarch: [ '' ]
         exclude:
           - os: rhel-7 # AWS does not provide an RHEL 7 arm64 AMI
             arch: arm64
@@ -47,7 +48,8 @@ jobs:
             arch: arm64
         include:
           - os: debian-12
-            arch: x86
+            arch: amd64
+            subarch: x86
       fail-fast: false
 
     steps:
@@ -167,7 +169,7 @@ jobs:
                 export DEB_CFLAGS_MAINT_APPEND=$(echo $ENV_JSON | jq -r '."${{ matrix.os }}".DEB_CFLAGS_MAINT_APPEND')
                 export DEB_LDFLAGS_MAINT_APPEND=$(echo $ENV_JSON | jq -r '."${{ matrix.os }}".DEB_LDFLAGS_MAINT_APPEND')
                 CC_OPT=$(echo $ENV_JSON | jq -r '."${{ matrix.os }}".CC_OPT')
-                case "${{ matrix.arch }}" in
+                case "${{ matrix.subarch }}" in
                   x86)
                     CC_OPT_ADD="-m32"
                     LD_OPT_ADD="-m32"
@@ -185,7 +187,7 @@ jobs:
 
             NGINX_CONFIGURE_CMD=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_CMD')
             NGINX_CONFIGURE_CMD_APPEND=$(echo $ENV_JSON | jq -r '."${{ matrix.os }}".NGINX_CONFIGURE_CMD_APPEND // empty')
-            case "${{ matrix.arch }}" in
+            case "${{ matrix.subarch }}" in
               x86)
                 NGINX_CONFIGURE_CMD_APPEND="--with-perl=/usr/bin/perl5.36-i386-linux-gnu"
                 ;;

From b5e3782471e8170981097d580e885dc77fe05dd7 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 3 Jul 2024 19:17:51 -0700
Subject: [PATCH 2/3] njs: provide meaningful names to the jobs

---
 .github/workflows/njs-buildbot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/njs-buildbot.yml b/.github/workflows/njs-buildbot.yml
index 84b89fc..c24d664 100644
--- a/.github/workflows/njs-buildbot.yml
+++ b/.github/workflows/njs-buildbot.yml
@@ -32,6 +32,7 @@ jobs:
           exit 0
 
   test:
+    name: ${{ matrix.os }}, ${{ matrix.subarch != '' && matrix.subarch || matrix.arch }}
     runs-on: [ "${{ matrix.os }}-${{ matrix.arch }}" ]
     needs: check-if-allowed
     strategy:
@@ -264,6 +265,7 @@ jobs:
           TEST_NGINX_VERBOSE: 1
 
   asan:
+    name: ubuntu-22.04, amd64, asan, ${{ matrix.backend }}
     runs-on: [ ubuntu-22.04-amd64 ]
     needs: check-if-allowed
     strategy:
@@ -345,6 +347,7 @@ jobs:
           TEST_NGINX_VERBOSE: 1
 
   msan:
+    name: ubuntu-22.04, amd64, msan
     runs-on: [ ubuntu-22.04-amd64 ]
     needs: check-if-allowed
     env:
@@ -415,6 +418,7 @@ jobs:
           make clean
 
   print:
+    name: debian-12, amd64, print
     runs-on: [ debian-12-amd64 ]
     needs: check-if-allowed
 

From ad21bdfbc3dc1d687082c6e21eb09e93119c8107 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Mon, 8 Jul 2024 17:31:39 -0700
Subject: [PATCH 3/3] njs: try a workaround to user an older node runtime

---
 .github/workflows/njs-buildbot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/njs-buildbot.yml b/.github/workflows/njs-buildbot.yml
index c24d664..6108d4c 100644
--- a/.github/workflows/njs-buildbot.yml
+++ b/.github/workflows/njs-buildbot.yml
@@ -3,6 +3,9 @@ name: ci
 on:
   workflow_call:
 
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   check-if-allowed:
     if: ${{ ( github.repository_owner == 'nginx' || github.repository_owner == 'nginxinc' ) }}