Skip to content

Commit

Permalink
njs-buildbot: remove SLES 12 due to EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
thresheek committed Nov 5, 2024
1 parent 0bbcfe0 commit 955ba5e
Showing 1 changed file with 3 additions and 20 deletions.
23 changes: 3 additions & 20 deletions .github/workflows/njs-buildbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ jobs:
needs: check-if-allowed
strategy:
matrix:
os: [ alpine-3.19, amazonlinux-2, amazonlinux-2023, debian-11, debian-12, freebsd-14, rhel-8, rhel-9, sles-12, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
os: [ alpine-3.19, amazonlinux-2, amazonlinux-2023, debian-11, debian-12, freebsd-14, rhel-8, rhel-9, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
arch: [ amd64, arm64 ]
subarch: [ '' ]
exclude:
- os: freebsd-14 # we don't have arm64 builder for freebsd-14 yet
arch: arm64
- os: sles-12 # we don't have an arm64 for SLES 12
arch: arm64
include:
- os: debian-12
arch: amd64
Expand All @@ -57,11 +55,11 @@ jobs:
steps:
- name: checkout v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
if: ${{ matrix.os == 'amazonlinux-2' || matrix.os == 'sles-12' }}
if: ${{ matrix.os == 'amazonlinux-2' }}

- name: checkout v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
if: ${{ matrix.os != 'amazonlinux-2' && matrix.os != 'sles-12' }}
if: ${{ matrix.os != 'amazonlinux-2' }}

- name: Set the defaults and set up environment
run: |
Expand Down Expand Up @@ -117,12 +115,6 @@ jobs:
"LD_OPT": "-Wl,-z,relro -Wl,-z,now",
"type": "rpm"
},
"sles-12": {
"NGINX_CONFIGURE_CMD_APPEND": "--with-http_geoip_module --with-stream_geoip_module",
"CC_OPT": "$(rpm --eval %{optflags}) $(pcre2-config --cflags) -fPIC",
"LD_OPT": "-Wl,-z,relro -Wl,-z,now",
"type": "rpm"
},
"ubuntu-20.04": {
"NGINX_CONFIGURE_CMD_APPEND": "--with-http_geoip_module --with-stream_geoip_module",
"DEB_BUILD_MAINT_OPTIONS": "hardening=+all",
Expand Down Expand Up @@ -208,7 +200,6 @@ jobs:
git clone https://github.com/nginx/nginx-tests
- name: Check out and build quickjs
if: ${{ matrix.os != 'sles-12' }}
run: |
git clone https://github.com/bellard/quickjs
cd quickjs
Expand All @@ -228,7 +219,6 @@ jobs:
$MAKE_UTILITY clean
- name: Configure and make njs with quickjs
if: ${{ matrix.os != 'sles-12' }}
run: |
./configure \
--with-quickjs \
Expand All @@ -238,7 +228,6 @@ jobs:
$MAKE_UTILITY -j$(nproc)
- name: Test njs with quickjs
if: ${{ matrix.os != 'sles-12' }}
run: |
$MAKE_UTILITY test
$MAKE_UTILITY clean
Expand All @@ -264,7 +253,6 @@ jobs:
TEST_NGINX_VERBOSE: 1

- name: Configure and build nginx and njs modules with quickjs, static modules
if: ${{ matrix.os != 'sles-12' }}
run: |
cd nginx-source
$NGINX_CONFIGURE_CMD \
Expand All @@ -275,7 +263,6 @@ jobs:
$MAKE_UTILITY -j$(nproc)
- name: Test njs modules, static modules
if: ${{ matrix.os != 'sles-12' }}
run: |
ulimit -c unlimited
prove -v -j$(nproc) -Inginx-tests/lib --state=save nginx/t . || prove -v -Inginx-tests/lib --state=failed
Expand All @@ -284,7 +271,6 @@ jobs:
TEST_NGINX_VERBOSE: 1

- name: Test njs modules (js_engine qjs), static modules
if: ${{ matrix.os != 'sles-12' }}
run: |
ulimit -c unlimited
prove -v -j$(nproc) -Inginx-tests/lib --state=save nginx/t . || prove -v -Inginx-tests/lib --state=failed
Expand All @@ -295,7 +281,6 @@ jobs:
TEST_NGINX_VERBOSE: 1

- name: Configure and build nginx and njs modules with quickjs, dynamic modules
if: ${{ matrix.os != 'sles-12' }}
run: |
cd nginx-source
$NGINX_CONFIGURE_CMD \
Expand All @@ -307,7 +292,6 @@ jobs:
$MAKE_UTILITY -j$(nproc)
- name: Test njs modules, dynamic modules
if: ${{ matrix.os != 'sles-12' }}
run: |
ulimit -c unlimited
prove -v -j$(nproc) -Inginx-tests/lib --state=save nginx/t . || prove -v -Inginx-tests/lib --state=failed
Expand All @@ -317,7 +301,6 @@ jobs:
TEST_NGINX_VERBOSE: 1

- name: Test njs modules (js_engine qjs), dynamic modules
if: ${{ matrix.os != 'sles-12' }}
run: |
ulimit -c unlimited
prove -v -j$(nproc) -Inginx-tests/lib --state=save nginx/t . || prove -v -Inginx-tests/lib --state=failed
Expand Down

0 comments on commit 955ba5e

Please sign in to comment.