Skip to content

Commit

Permalink
Added SLES 15.
Browse files Browse the repository at this point in the history
  • Loading branch information
thresheek committed Nov 13, 2024
1 parent 729ec1d commit 0bd1b3f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/nginx-buildbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ jobs:
needs: check-if-allowed
strategy:
matrix:
os: [ alpine-3.19, alpine-3.20, amazonlinux-2, amazonlinux-2023, debian-11, debian-12, freebsd-14, rhel-8, rhel-9, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
os: [ alpine-3.19, alpine-3.20, amazonlinux-2, amazonlinux-2023, debian-11, debian-12, freebsd-14, rhel-8, rhel-9, sles-15, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
arch: [ amd64, arm64 ]
subarch: [ '' ]
sanitizer: [ '' ]
exclude:
- os: freebsd-14 # we don't have an arm64 builder for freebsd-14 yet
arch: arm64
- os: sles-15 # we don't have an arm64 builder for sles-15 yet
arch: arm64
include:
- os: debian-12
arch: amd64
Expand Down Expand Up @@ -109,6 +111,10 @@ jobs:
"CC_OPT": "$(rpm --eval %{optflags}) $(pcre2-config --cflags) -fPIC",
"LD_OPT": "-Wl,-z,relro -Wl,-z,now"
},
"sles-15": {
"CC_OPT": "$(rpm --eval %{optflags}) $(pcre2-config --cflags) -fPIC",
"LD_OPT": "-Wl,-z,relro -Wl,-z,now"
},
"ubuntu-20.04": {
"CC_OPT": "$(DEB_BUILD_MAINT_OPTIONS=hardening=+all DEB_CFLAGS_MAINT_APPEND=-fPIC DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed dpkg-buildflags --get CFLAGS)",
"LD_OPT": "$(DEB_BUILD_MAINT_OPTIONS=hardening=+all DEB_CFLAGS_MAINT_APPEND=-fPIC DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed dpkg-buildflags --get LDFLAGS)"
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/njs-buildbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ 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, 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, sles-15, 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-15 # we don't have arm64 builder for sles-15 yet
arch: arm64
include:
- os: debian-12
arch: amd64
Expand Down Expand Up @@ -115,6 +117,12 @@ jobs:
"LD_OPT": "-Wl,-z,relro -Wl,-z,now",
"type": "rpm"
},
"sles-15": {
"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

0 comments on commit 0bd1b3f

Please sign in to comment.