[apisix] branch master updated: ci: fix the rpm build (#5130)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 6162ca0  ci: fix the rpm build (#5130)
6162ca0 is described below

commit 6162ca0ef92445fdd15b7a213655887b66cd4eea
Author: Joey <ma...@apache.org>
AuthorDate: Fri Sep 24 17:49:56 2021 +0800

    ci: fix the rpm build (#5130)
---
 .github/workflows/centos7-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 7801eb2..be94a7e 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -48,8 +48,13 @@ jobs:
         export VERSION=${{ steps.branch_env.outputs.version }}
         sudo gem install --no-document fpm
         git clone -b v2.2.1 https://github.com/api7/apisix-build-tools.git
+
+        # move codes under build tool
+        mkdir ./apisix-build-tools/apisix
+        for dir in `ls|grep -v "^apisix-build-tools$"`;do cp -r $dir ./apisix-build-tools/apisix/;done
+
         cd apisix-build-tools
-        make package type=rpm app=apisix version=${VERSION} checkout=release/${VERSION} image_base=centos image_tag=7 local_code_path=../apisix
+        make package type=rpm app=apisix version=${VERSION} checkout=release/${VERSION} image_base=centos image_tag=7 local_code_path=./apisix
         cd ..
         rm -rf $(ls -1 --ignore=apisix-build-tools --ignore=t --ignore=utils --ignore=ci --ignore=Makefile --ignore=rockspec)