Skip to content

Commit 755d175

Browse files
AlinsRanAlinsRan
authored
fix: apisix should rely on a fixed version of apisix-runtime (#358)
1 parent d2ce2b8 commit 755d175

15 files changed

+179
-229
lines changed

‎.circleci/config.yml‎

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,63 @@ version: 2.1
44
# Define a job to be invoked later in a workflow.
55
# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
66
jobs:
7-
build:
7+
build-apisix-runtime:
88
# Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
99
# See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
1010
machine:
1111
image: ubuntu-2004:202101-01
1212
resource_class: arm.medium
1313
environment:
14-
- PACKAGE_APISIX_VERSION: 0-latest
15-
- BUILD_APISIX_RUNTIME_VERSION: 1.0.1
14+
BUILD_APISIX_RUNTIME_VERSION: 0-latest
1615
steps:
1716
- checkout
1817
- run:
1918
name: install dependencies
2019
command: |
21-
sudo apt-get install -y make
20+
sudo apt-get install -y make ruby ruby-dev rubygems build-essential
21+
- run:
22+
name: build apisix-runtime rpm
23+
command: |
24+
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
25+
- run:
26+
name: run ubi8 docker and mapping apisix-runtime rpm into container
27+
command: |
28+
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
29+
- run:
30+
name: install dependencies in container
31+
command: |
32+
docker exec ubiInstance bash -c "dnf install -y yum-utils"
33+
docker exec ubiInstance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
34+
docker exec ubiInstance bash -c "yum -y install openresty-openssl111 openresty-pcre openresty-zlib"
2235
- run:
23-
name: package apisix-runtime
36+
name: install rpm in container
2437
command: |
25-
make package type=deb app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION}
38+
docker exec ubiInstance bash -c "ls -la /output"
39+
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi8.6.x86_64.rpm"
40+
- run:
41+
name: check and ensure apisix-runtime is installed
42+
command: |
43+
export APISIX_RUNTIME_VER=$(docker exec ubiInstance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_RUNTIME_VER=/{print $5}' | awk -v FS="=" '{print $2}')
44+
45+
build-apisix:
46+
# Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
47+
# See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
48+
machine:
49+
image: ubuntu-2004:202101-01
50+
resource_class: arm.medium
51+
environment:
52+
PACKAGE_APISIX_VERSION: 0-latest
53+
steps:
54+
- checkout
55+
- run:
56+
name: install dependencies
57+
command: |
58+
sudo apt-get install -y make
2659
- run:
2760
name: package apisx
2861
command: |
29-
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${BUILD_APISIX_RUNTIME_VERSION} checkout=master image_base=ubuntu image_tag=20.04
62+
wget https://raw.githubusercontent.com/apache/apisix/master/.requirements && source .requirements
63+
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=master image_base=ubuntu image_tag=20.04
3064
- run:
3165
name: install apisix deb into container
3266
command: |
@@ -124,7 +158,7 @@ jobs:
124158
image: ubuntu-2004:202101-01
125159
resource_class: arm.medium
126160
environment:
127-
- VAR_WORKBENCH_DIR: /tmp/output
161+
VAR_WORKBENCH_DIR: /tmp/output
128162
steps:
129163
- checkout
130164
- run:
@@ -183,6 +217,16 @@ jobs:
183217
# Invoke jobs via workflows
184218
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
185219
workflows:
220+
builds:
221+
jobs:
222+
- build-apisix-runtime:
223+
filters:
224+
branches:
225+
only: master
226+
- build-apisix:
227+
filters:
228+
branches:
229+
only: master
186230
build-and-push-apisix-runtime-dev:
187231
triggers:
188232
- schedule:

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 60
2121
env:
22-
PACKAGE_APISIX_VERSION: 3.7.0
23-
BUILD_APISIX_RUNTIME_VERSION: 1.0.1
22+
PACKAGE_APISIX_VERSION: 0.0.0
23+
APISIX_VERSION: 3.7.0
2424
steps:
2525
- uses: actions/checkout@v2
2626

2727
- name: install dependencies
2828
run: |
2929
sudo apt-get install -y make
30-
30+
3131
- name: run apisix packaging
3232
run: |
33-
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${BUILD_APISIX_RUNTIME_VERSION} checkout=master image_base=ubuntu image_tag=20.04
33+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
34+
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=20.04
3435
3536
- name: install apisix deb into container
3637
run: |

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 60
2121
env:
22-
PACKAGE_APISIX_VERSION: 3.7.0
23-
BUILD_APISIX_RUNTIME_VERSION: 1.0.1
22+
APISIX_VERSION: 3.7.0
2423
services:
2524
etcd:
2625
image: bitnami/etcd:3.4.0
@@ -42,12 +41,14 @@ jobs:
4241
4342
- name: packaging APISIX(-remote) with remote code
4443
run: |
45-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=centos image_tag=7 artifact=apisix-remote
44+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
45+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=centos image_tag=7 artifact=apisix-remote
4646
4747
- name: packaging APISIX(-local) with local code
4848
run: |
49-
git clone https://github.com/apache/apisix.git
50-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=centos image_tag=7 local_code_path=./apisix artifact=apisix-local
49+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
50+
git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
51+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=centos image_tag=7 local_code_path=./apisix artifact=apisix-local
5152
5253
- name: run centos7 docker and mapping rpm into container
5354
run: |

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 60
2121
env:
22-
PACKAGE_APISIX_VERSION: 3.7.0
23-
BUILD_APISIX_RUNTIME_VERSION: 1.0.1
22+
APISIX_VERSION: 3.7.0
2423
services:
2524
etcd:
2625
image: bitnami/etcd:3.4.0
@@ -42,12 +41,14 @@ jobs:
4241
4342
- name: packaging APISIX(-remote) with remote code
4443
run: |
45-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=centos image_tag=8 artifact=apisix-remote
44+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
45+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=centos image_tag=8 artifact=apisix-remote
4646
4747
- name: packaging APISIX(-local) with local code
4848
run: |
49-
git clone https://github.com/apache/apisix.git
50-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=centos image_tag=8 local_code_path=./apisix artifact=apisix-local
49+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
50+
git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
51+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=centos image_tag=8 local_code_path=./apisix artifact=apisix-local
5152
5253
- name: run centos8 docker and mapping rpm into container
5354
run: |

‎.github/workflows/package-apisix-rpm-ubi.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
timeout-minutes: 60
1919
env:
20-
PACKAGE_APISIX_VERSION: 3.7.0
21-
BUILD_APISIX_RUNTIME_VERSION: 1.0.1
20+
APISIX_VERSION: 3.7.0
2221
services:
2322
etcd:
2423
image: bitnami/etcd:3.4.0
@@ -40,12 +39,14 @@ jobs:
4039
4140
- name: packaging APISIX(-remote) with remote code
4241
run: |
43-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 artifact=apisix-remote
42+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
43+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 artifact=apisix-remote
4444
4545
- name: packaging APISIX(-local) with local code
4646
run: |
47-
git clone https://github.com/apache/apisix.git
48-
make package type=rpm app=apisix version=master checkout=master runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
47+
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
48+
git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
49+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
4950
5051
- name: run ubi8 docker and mapping rpm into container
5152
run: |

‎.github/workflows/publish-deb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
echo "TAG_TYPE=${type}" >> "$GITHUB_ENV"
4242
4343
- name: Check Tags Type
44-
if: ${{ env.TAG_TYPE != 'apisix' && env.TAG_TYPE != 'apisix-base' && env.TAG_TYPE != 'apisix-runtime' }}
44+
if: ${{ env.TAG_TYPE != 'apisix' && env.TAG_TYPE != 'apisix-base' }}
4545
run: |
46-
echo "##[error]Tag type is not correct, please check it."
46+
echo "##[error]Tag type is not correct, or not support, please check it."
4747
exit 1
4848
4949
- name: Build apisix-base deb Package

‎.github/workflows/publish.yml‎

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,29 @@ jobs:
3434
TAG_DATE=$(date +%Y%m%d)
3535
echo "TAG_DATE=${TAG_DATE}" >> "$GITHUB_ENV"
3636
37-
- name: Extract Tags name
37+
- name: Extract Tags version
3838
if: ${{ startsWith(github.ref, 'refs/tags/') }}
39-
id: tag_env
4039
shell: bash
4140
run: |
42-
echo "##[set-output name=version;]$(echo ${GITHUB_REF##*/})"
41+
echo "TAG_VERSION=${GITHUB_REF##*/}" >> "$GITHUB_ENV"
4342
4443
- name: Extract Tags Type
4544
if: ${{ startsWith(github.ref, 'refs/tags/') }}
46-
id: tag_type
4745
shell: bash
4846
run: |
49-
echo "##[set-output name=version;]$(echo ${GITHUB_REF#refs/tags/})"
47+
type=$(echo ${GITHUB_REF} | awk -F '/' '{print $3}')
48+
echo "TAG_TYPE=${type}" >> "$GITHUB_ENV"
49+
50+
- name: Check Tags Type
51+
if: ${{ env.TAG_TYPE != 'apisix' && env.TAG_TYPE != 'apisix-base' && env.TAG_TYPE != 'dashboard' }}
52+
run: |
53+
echo "##[error]Tag type is not correct, or not support, please check it."
54+
exit 1
5055
5156
- name: Build apisix RPM Package
52-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix/') }}
57+
if: ${{ env.TAG_TYPE == 'apisix' }}
5358
env:
54-
APISIX_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
59+
APISIX_TAG_VERSION: ${{ env.TAG_VERSION }}
5560
run: |
5661
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_TAG_VERSION}/.requirements
5762
source .requirements
@@ -64,37 +69,35 @@ jobs:
6469
echo "TARGET_APP=apisix" >> "$GITHUB_ENV"
6570
6671
- name: Build apisix-base RPM Package
67-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
72+
if: ${{ env.TAG_TYPE == 'apisix-base' }}
6873
env:
69-
APISIX_BASE_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
74+
APISIX_BASE_TAG_VERSION: ${{ env.TAG_VERSION }}
7075
run: |
7176
# build apisix-base
72-
echo ${{ steps.tag_env.outputs.version}}
73-
echo ${{ steps.tag_type.outputs.version}}
77+
echo ${{ env.TAG_TYPE }} ${{ env.TAG_VERSION }}
7478
make package type=rpm app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=centos image_tag=7
7579
make package type=rpm app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=centos image_tag=8
7680
make package type=rpm app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
7781
mv ./output/apisix-base-${APISIX_BASE_TAG_VERSION}-0.{el7,el8,ubi8.6}.x86_64.rpm ${VAR_RPM_WORKBENCH_DIR}
7882
echo "TARGET_APP=apisix-base" >> "$GITHUB_ENV"
7983
8084
- name: Build apisix-runtime RPM Package
81-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-runtime/') }}
85+
if: ${{ env.TAG_TYPE == 'apisix-runtime' }}
8286
env:
83-
APISIX_RUNTIME_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
87+
APISIX_RUNTIME_TAG_VERSION: ${{ env.TAG_VERSION }}
8488
run: |
8589
# build apisix-runtime
86-
echo ${{ steps.tag_env.outputs.version}}
87-
echo ${{ steps.tag_type.outputs.version}}
90+
echo ${{ env.TAG_TYPE }} ${{ env.TAG_VERSION }}
8891
make package type=rpm app=apisix-runtime checkout=${APISIX_RUNTIME_TAG_VERSION} version=${APISIX_RUNTIME_TAG_VERSION} image_base=centos image_tag=7
8992
make package type=rpm app=apisix-runtime checkout=${APISIX_RUNTIME_TAG_VERSION} version=${APISIX_RUNTIME_TAG_VERSION} image_base=centos image_tag=8
9093
make package type=rpm app=apisix-runtime checkout=${APISIX_RUNTIME_TAG_VERSION} version=${APISIX_RUNTIME_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
9194
mv ./output/apisix-runtime-${APISIX_RUNTIME_TAG_VERSION}-0.{el7,el8,ubi8.6}.x86_64.rpm ${VAR_RPM_WORKBENCH_DIR}
9295
echo "TARGET_APP=apisix-runtime" >> "$GITHUB_ENV"
9396
9497
- name: Build apisix-dashboard RPM Package
95-
if: ${{ startsWith(steps.tag_type.outputs.version, 'dashboard/') }}
98+
if: ${{ env.TAG_TYPE == 'dashboard' }}
9699
env:
97-
APISIX_DASHBOARD_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
100+
APISIX_DASHBOARD_TAG_VERSION: ${{ env.TAG_VERSION }}
98101
run: |
99102
# build apisix dashboard
100103
make package type=rpm app=dashboard checkout=${APISIX_DASHBOARD_TAG_VERSION} version=${APISIX_DASHBOARD_TAG_VERSION} image_base=centos image_tag=7
@@ -108,53 +111,67 @@ jobs:
108111
ls -al "${VAR_RPM_WORKBENCH_DIR}"
109112
110113
- name: Upload apisix Artifact for Redhat
111-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix/') }}
114+
if: ${{ env.TAG_TYPE == 'apisix' }}
112115
uses: actions/[email protected]
116+
env:
117+
PACKAGE_NAME: apisix-${{ env.TAG_VERSION }}-0.ubi8.6.x86_64.rpm
113118
with:
114-
name: "apisix-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
115-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
119+
name: "${PACKAGE_NAME}"
120+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
116121

117122
- name: Upload apisix Artifact for Centos
118-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix/') }}
123+
if: ${{ env.TAG_TYPE == 'apisix' }}
119124
uses: actions/[email protected]
125+
env:
126+
PACKAGE_NAME: apisix-${{ env.TAG_VERSION }}-0.el7.x86_64.rpm
120127
with:
121-
name: "apisix-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
122-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
128+
name: "${PACKAGE_NAME}"
129+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
123130

124131
- name: Upload apisix-base Artifact for Redhat
125-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
132+
if: ${{ env.TAG_TYPE == 'apisix-base' }}
126133
uses: actions/[email protected]
134+
env:
135+
PACKAGE_NAME: apisix-base-${{ env.TAG_VERSION }}-0.ubi8.6.x86_64.rpm
127136
with:
128-
name: "apisix-base-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
129-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-base-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
137+
name: "${PACKAGE_NAME}"
138+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
130139

131140
- name: Upload apisix-base Artifact for Centos
132-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
141+
if: ${{ env.TAG_TYPE == 'apisix-base' }}
133142
uses: actions/[email protected]
143+
env:
144+
PACKAGE_NAME: apisix-base-${{ env.TAG_VERSION }}-0.el7.x86_64.rpm
134145
with:
135-
name: "apisix-base-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
136-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-base-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
146+
name: "${PACKAGE_NAME}"
147+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
137148

138149
- name: Upload apisix-runtime Artifact for Redhat
139-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-runtime/') }}
150+
if: ${{ env.TAG_TYPE == 'apisix-runtime' }}
140151
uses: actions/[email protected]
152+
env:
153+
PACKAGE_NAME: apisix-runtime-${{ env.TAG_VERSION }}-0.ubi8.6.x86_64.rpm
141154
with:
142-
name: "apisix-runtime-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
143-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-runtime-${{ steps.tag_env.outputs.version}}-0.ubi8.6.x86_64.rpm"
155+
name: "${PACKAGE_NAME}"
156+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
144157

145158
- name: Upload apisix-runtime Artifact for Centos
146-
if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-runtime/') }}
159+
if: ${{ env.TAG_TYPE == 'apisix-runtime' }}
147160
uses: actions/[email protected]
161+
env:
162+
PACKAGE_NAME: apisix-runtime-${{ env.TAG_VERSION }}-0.el7.x86_64.rpm
148163
with:
149-
name: "apisix-runtime-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
150-
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/apisix-runtime-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
164+
name: "${PACKAGE_NAME}"
165+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
151166

152167
- name: Upload apisix-dashboard Artifact
153-
if: ${{ startsWith(steps.tag_type.outputs.version, 'dashboard/') }}
168+
if: ${{ env.TAG_TYPE == 'dashboard' }}
154169
uses: actions/[email protected]
170+
env:
171+
PACKAGE_NAME: apisix-dashboard-${{ env.TAG_VERSION }}-0.el7.x86_64.rpm
155172
with:
156-
name: "apisix-dashboard-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
157-
path: "./apisix-dashboard-${{ steps.tag_env.outputs.version}}-0.el7.x86_64.rpm"
173+
name: "${PACKAGE_NAME}"
174+
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${PACKAGE_NAME}"
158175

159176
- name: RPM repo deps init
160177
env:

0 commit comments

Comments
 (0)