chore(CI): fix relup error in enterprise

This commit is contained in:
zhanghongtong 2021-06-05 01:36:00 +08:00 committed by Rory Z
parent 2711dc6219
commit 2052521715
1 changed files with 9 additions and 15 deletions

View File

@ -19,7 +19,7 @@ jobs:
outputs:
profiles: ${{ steps.set_profile.outputs.profiles}}
old_vsns: ${{ steps.get_old_vsns.outputs.old_vsns}}
old_vsns: ${{ steps.set_profile.outputs.old_vsns}}
steps:
- uses: actions/checkout@v2
@ -30,9 +30,16 @@ jobs:
id: set_profile
shell: bash
run: |
if make -C source emqx-ee --dry-run > /dev/null 2>&1; then
cd source
vsn="$(./pkg-vsn.sh)"
pre_vsn="$(echo $vsn | grep -oE '^[0-9]+.[0-9]')"
if make emqx-ee --dry-run > /dev/null 2>&1; then
old_vsns="$(git tag -l "e$pre_vsn.[0-9]" | xargs echo -n | sed "s/e$vsn//")"
echo "::set-output name=old_vsns::$old_vsns"
echo "::set-output name=profiles::[\"emqx-ee\"]"
else
old_vsns="$(git tag -l "v$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")"
echo "::set-output name=old_vsns::$old_vsns"
echo "::set-output name=profiles::[\"emqx\", \"emqx-edge\"]"
fi
- name: get_all_deps
@ -48,19 +55,6 @@ jobs:
echo "${{ secrets.CI_GIT_TOKEN }}" >> source/scripts/git-token
make -C source deps-all
zip -ryq source.zip source/* source/.[^.]*
- name: get old version
id: get_old_vsns
run: |
set -e -x -u
cd source
vsn="$(./pkg-vsn.sh)"
pre_vsn="$(echo $vsn | grep -oE '^[0-9]+.[0-9]')"
if make -C source emqx-ee --dry-run > /dev/null 2>&1; then
old_vsns="$(git tag -l "e$pre_vsn.[0-9]" | xargs echo -n | sed "s/e$vsn//")"
else
old_vsns="$(git tag -l "v$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")"
fi
echo "::set-output name=old_vsns::$old_vsns"
- uses: actions/upload-artifact@v2
with:
name: source