Skip to content

Commit

Permalink
Remove jammy flavor on s390x arch, for now (openresty#209)
Browse files Browse the repository at this point in the history
This is blocking releases.  For the last
release, I had to many times over days before to finally succeed.  I'll bring it
back again someday.
  • Loading branch information
neomantra committed Jun 30, 2022
1 parent 1ae236c commit 8e8749f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,12 @@ jobs:
script:
- ./docker_build_and_push_flavor.sh jammy-amd64 jammy/Dockerfile

- name: Build Docker image for build-from-source flavor -- jammy / s390x
arch: s390x
stage: build
script:
- ./docker_build_and_push_flavor.sh jammy-s390x jammy/Dockerfile --build-arg RESTY_PCRE_BUILD_OPTIONS="" --build-arg RESTY_PCRE_OPTIONS=""
# jammy / s390x disabled due to build issues (#209)
# - name: Build Docker image for build-from-source flavor -- jammy / s390x
# arch: s390x
# stage: build
# script:
# - ./docker_build_and_push_flavor.sh jammy-s390x jammy/Dockerfile --build-arg RESTY_PCRE_BUILD_OPTIONS="" --build-arg RESTY_PCRE_OPTIONS=""

###############################################################################
# Build From OpenResty Upstream Flavors
Expand Down Expand Up @@ -163,7 +164,7 @@ jobs:
- ./docker_manifest.sh centos7 centos7-amd64 centos7-aarch64
- ./docker_manifest.sh fedora fedora-amd64 fedora-aarch64
- ./docker_manifest.sh focal focal-amd64 focal-aarch64 focal-s390x
- ./docker_manifest.sh jammy jammy-amd64 jammy-aarch64 jammy-s390x
- ./docker_manifest.sh jammy jammy-amd64 jammy-aarch64 #jammy-s309x
- ./docker_manifest.sh rocky rocky-amd64 rocky-aarch64
- ./docker_tag_alias.sh centos centos-rpm
- ./docker_tag_alias.sh fedora fedora-rpm
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
## 1.21.4.1-2

* Update OpenSSL to 1.1.1p for built-from-source flavors due to CVE-2022-2068
* Remove `jammy` flavor on `s390x` architecture because the build rarely succeeds (#209)

## 1.21.4.1-1

Expand Down

0 comments on commit 8e8749f

Please sign in to comment.