Skip to content

Commit d9280f2

Browse files
gxthrjgxthrj
committed
merge master
2 parents 7ac1672 + 122f853 commit d9280f2

25 files changed

+294
-159
lines changed

‎.github/workflows/package-apisix-openresty-deb-ubuntu20.04.yml‎ renamed to ‎.github/workflows/package-apisix-base-deb-ubuntu20.04.yml‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
name: package apisix-openresty deb for ubuntu 20.04(Focal Fossa)
1+
name: package apisix-base deb for ubuntu 20.04(Focal Fossa)
22

33
on:
44
push:
55
branches: [ master ]
66
tags:
77
- "v*"
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
BUILD_APISIX_OR_VERSION: 1.19.3.2.0
21+
BUILD_APISIX_BASE_VERSION: 1.19.3.2.0
1822
steps:
1923
- uses: actions/checkout@v2
2024

2125
- name: install dependencies
2226
run: |
2327
sudo apt-get install -y make ruby ruby-dev rubygems build-essential
2428
25-
- name: build apisix-openresty deb
29+
- name: build apisix-base deb
2630
run: |
27-
make package type=deb app=apisix-openresty version=${BUILD_APISIX_OR_VERSION} image_base=ubuntu image_tag=20.04
31+
make package type=deb app=apisix-base version=${BUILD_APISIX_BASE_VERSION} image_base=ubuntu image_tag=20.04
2832
29-
- name: run ubuntu 20.04 docker and mapping apisix-openresty deb into container
33+
- name: run ubuntu 20.04 docker and mapping apisix-base deb into container
3034
run: |
3135
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubuntu20.04Instance --net="host" docker.io/ubuntu:20.04 /bin/bash
3236
@@ -42,9 +46,17 @@ jobs:
4246
4347
- name: install deb in container
4448
run: |
45-
docker exec ubuntu20.04Instance bash -c "dpkg -i /output/apisix-openresty_${BUILD_APISIX_OR_VERSION}-0~ubuntu20.04_amd64.deb"
49+
docker exec ubuntu20.04Instance bash -c "dpkg -i /output/apisix-base_${BUILD_APISIX_BASE_VERSION}-0~ubuntu20.04_amd64.deb"
4650
47-
- name: check and ensure openresty is installed
51+
- name: check and ensure apisix-base is installed
4852
run: |
49-
export APISIX_OPENRESTY_VER=$(docker exec ubuntu20.04Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_OPENRESTY_VER=/{print $5}' | awk -v FS="=" '{print $2}')
50-
if [ "$APISIX_OPENRESTY_VER" != "${BUILD_APISIX_OR_VERSION}" ]; then exit 1; fi
53+
export APISIX_BASE_VER=$(docker exec ubuntu20.04Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_BASE_VER=/{print $5}' | awk -v FS="=" '{print $2}')
54+
if [ "$APISIX_BASE_VER" != "${BUILD_APISIX_BASE_VERSION}" ]; then exit 1; fi
55+
56+
- name: Publish Artifact
57+
uses: actions/upload-artifact@v2.2.4
58+
with:
59+
name: apisix-base_${{ env.BUILD_APISIX_BASE_VERSION }}-0~ubuntu20.04_amd64.deb
60+
path: output/apisix-base_${{ env.BUILD_APISIX_BASE_VERSION }}-0~ubuntu20.04_amd64.deb
61+
retention-days: 5
62+
if-no-files-found: error

‎.github/workflows/package-apisix-base-rpm-el7.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: package apisix-base rpm for el7
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
tags:
7+
- "v*"
8+
paths-ignore:
9+
- '*.md'
10+
pull_request:
11+
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
14+
schedule:
15+
- cron: '0 0 * * *'
16+
17+
jobs:
18+
build:
19+
runs-on: ubuntu-latest
20+
env:
21+
BUILD_APISIX_BASE_VERSION: 1.19.3.2.0
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: install dependencies
26+
run: |
27+
sudo apt-get install -y make ruby ruby-dev rubygems build-essential
28+
29+
- name: build apisix-base rpm
30+
run: |
31+
make package type=rpm app=apisix-base version=${BUILD_APISIX_BASE_VERSION} image_base=centos image_tag=7
32+
33+
- name: run centos7 docker and mapping apisix-base rpm into container
34+
run: |
35+
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name centos7Instance --net="host" docker.io/centos:7 /bin/bash
36+
37+
- name: install dependencies in container
38+
run: |
39+
docker exec centos7Instance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
40+
docker exec centos7Instance bash -c "yum -y install openresty-openssl111 openresty-pcre openresty-zlib"
41+
42+
- name: install rpm in container
43+
run: |
44+
docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-base-${BUILD_APISIX_BASE_VERSION}-0.el7.x86_64.rpm"
45+
46+
- name: check and ensure apisix-base is installed
47+
run: |
48+
export APISIX_BASE_VER=$(docker exec centos7Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_BASE_VER=/{print $5}' | awk -v FS="=" '{print $2}')
49+
if [ "$APISIX_BASE_VER" != "${BUILD_APISIX_BASE_VERSION}" ]; then exit 1; fi
50+
51+
- name: Publish Artifact
52+
uses: actions/upload-artifact@v2.2.4
53+
with:
54+
name: apisix-base-${{ env.BUILD_APISIX_BASE_VERSION }}-0.el7.x86_64.rpm
55+
path: output/apisix-base-${{ env.BUILD_APISIX_BASE_VERSION }}-0.el7.x86_64.rpm
56+
retention-days: 5
57+
if-no-files-found: error

‎.github/workflows/package-apisix-dashboard-deb-ubuntu20.04.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ on:
55
branches: [ master ]
66
tags:
77
- "v*"
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
DASHBOARD_VERSION: 2.7
21+
DASHBOARD_VERSION: 2.8
1822
services:
1923
etcd:
2024
image: bitnami/etcd:3.4.0
@@ -54,3 +58,10 @@ jobs:
5458
exit 1
5559
fi
5660
61+
- name: Publish Artifact
62+
uses: actions/upload-artifact@v2.2.4
63+
with:
64+
name: apisix-dashboard_${{ env.DASHBOARD_VERSION }}-0~ubuntu20.04_amd64.deb
65+
path: output/apisix-dashboard_${{ env.DASHBOARD_VERSION }}-0~ubuntu20.04_amd64.deb
66+
retention-days: 5
67+
if-no-files-found: error

‎.github/workflows/package-apisix-dashboard-el7-buildx.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ on:
55
branches: [master]
66
tags:
77
- 'v*'
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [master]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
DASHBOARD_VERSION: 2.7
21+
DASHBOARD_VERSION: 2.8
1822
services:
1923
etcd:
2024
image: bitnami/etcd:3.4.0

‎.github/workflows/package-apisix-dashboard-rpm-el7.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ on:
55
branches: [ master ]
66
tags:
77
- "v*"
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
DASHBOARD_VERSION: 2.7
21+
DASHBOARD_VERSION: 2.8
1822
services:
1923
etcd:
2024
image: bitnami/etcd:3.4.0
@@ -81,3 +85,15 @@ jobs:
8185
echo "failed: failed to install Apache APISIX Dashboard by rpm"
8286
exit 1
8387
fi
88+
89+
- name: Rename rpm package
90+
run: |
91+
mv output/apisix-dashboard-local-${DASHBOARD_VERSION}-0.el7.x86_64.rpm output/apisix-dashboard-${DASHBOARD_VERSION}-0.el7.x86_64.rpm
92+
93+
- name: Publish Artifact
94+
uses: actions/upload-artifact@v2.2.4
95+
with:
96+
name: apisix-dashboard-${{ env.DASHBOARD_VERSION }}-0.el7.x86_64.rpm
97+
path: output/apisix-dashboard-${{ env.DASHBOARD_VERSION }}-0.el7.x86_64.rpm
98+
retention-days: 5
99+
if-no-files-found: error

‎.github/workflows/package-apisix-dashboard-rpm-el8.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ on:
55
branches: [ master ]
66
tags:
77
- "v*"
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
DASHBOARD_VERSION: 2.7
21+
DASHBOARD_VERSION: 2.8
1822
services:
1923
etcd:
2024
image: bitnami/etcd:3.4.0
@@ -56,3 +60,10 @@ jobs:
5660
exit 1
5761
fi
5862
63+
- name: Publish Artifact
64+
uses: actions/upload-artifact@v2.2.4
65+
with:
66+
name: apisix-dashboard-${{ env.DASHBOARD_VERSION }}-0.el8.x86_64.rpm
67+
path: output/apisix-dashboard-${{ env.DASHBOARD_VERSION }}-0.el8.x86_64.rpm
68+
retention-days: 5
69+
if-no-files-found: error

‎.github/workflows/package-apisix-deb-ubuntu20.04.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ on:
55
branches: [ master ]
66
tags:
77
- "v*"
8+
paths-ignore:
9+
- '*.md'
810
pull_request:
911
branches: [ master ]
12+
paths-ignore:
13+
- '*.md'
1014
schedule:
1115
- cron: '0 0 * * *'
1216

1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
1620
env:
17-
PACKAGE_APISIX_VERSION: 2.7
21+
PACKAGE_APISIX_VERSION: 2.9
1822

1923
steps:
2024
- uses: actions/checkout@v2
@@ -54,3 +58,11 @@ jobs:
5458
printf "result_code: %s\n" "$result_code"
5559
exit 125
5660
fi
61+
62+
- name: Publish Artifact
63+
uses: actions/upload-artifact@v2.2.4
64+
with:
65+
name: apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu20.04_amd64.deb
66+
path: output/apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu20.04_amd64.deb
67+
retention-days: 5
68+
if-no-files-found: error

‎.github/workflows/package-apisix-openresty-rpm-el7.yml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)