Skip to content

ci: use latest apisix-base with latest apisix #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2022
Merged

ci: use latest apisix-base with latest apisix #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/package-apisix-rpm-el7-with-apisix-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
BUILD_APISIX_BASE_VERSION: 1.19.3.2.0
services:
etcd:
image: bitnami/etcd:3.4.0
Expand All @@ -42,11 +40,11 @@ jobs:
- name: packaging APISIX
run: |
make package type=rpm app=apisix version=2.7 checkout=release/2.7 image_base=centos image_tag=7 openresty=apisix-base
make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=7 openresty=apisix-base
make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=7 openresty=apisix-base-latest

- name: packaging apisix-base
run: |
make package type=rpm app=apisix-base version=${BUILD_APISIX_BASE_VERSION} image_base=centos image_tag=7
make package type=rpm app=apisix-base version=latest image_base=centos image_tag=7

- name: run centos7 docker and mapping rpm into container
run: |
Expand All @@ -59,6 +57,7 @@ jobs:

- name: install APISIX which depens on apisix-base by rpm in container
run: |
docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-base-latest-0.el7.x86_64.rpm"
docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-master-0.el7.x86_64.rpm"
docker exec centos7Instance bash -c "apisix start"

Expand Down
2 changes: 1 addition & 1 deletion build-apisix-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail
set -x

if [ $# -gt 0 ] && [ "$1" == "latest" ]; then
if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
ngx_multi_upstream_module_ver=""
mod_dubbo_ver=""
apisix_nginx_module_ver=""
Expand Down
7 changes: 5 additions & 2 deletions package-apisix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ then
fi

# Determine the min version of openresty or apisix-base
# openresty >= 1.17.8.2
# apisix-base >= 1.19.3.2.0
or_version="1.17.8.2"
if [ "$OPENRESTY" == "apisix-base" ]
then
or_version="1.19.9.1.0"
elif [ "$OPENRESTY" == "apisix-base-latest" ]
then
# For CI
OPENRESTY="apisix-base"
or_version="latest"
fi

# Determine the name of artifact
Expand Down