ソースを参照

chore(CI): fix relup error in enterprise

zhanghongtong 4 年 前
コミット
2052521715
1 ファイル変更9 行追加15 行削除
  1. 9 15
      .github/workflows/build_packages.yaml

+ 9 - 15
.github/workflows/build_packages.yaml

@@ -19,7 +19,7 @@ jobs:
 
 
     outputs:
     outputs:
       profiles: ${{ steps.set_profile.outputs.profiles}}
       profiles: ${{ steps.set_profile.outputs.profiles}}
-      old_vsns: ${{ steps.get_old_vsns.outputs.old_vsns}}
+      old_vsns: ${{ steps.set_profile.outputs.old_vsns}}
 
 
     steps:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
@@ -30,9 +30,16 @@ jobs:
         id: set_profile
         id: set_profile
         shell: bash
         shell: bash
         run: |
         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\"]"
             echo "::set-output name=profiles::[\"emqx-ee\"]"
           else
           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\"]"
             echo "::set-output name=profiles::[\"emqx\", \"emqx-edge\"]"
           fi
           fi
       - name: get_all_deps
       - name: get_all_deps
@@ -48,19 +55,6 @@ jobs:
           echo "${{ secrets.CI_GIT_TOKEN }}" >> source/scripts/git-token
           echo "${{ secrets.CI_GIT_TOKEN }}" >> source/scripts/git-token
           make -C source deps-all
           make -C source deps-all
           zip -ryq source.zip source/* source/.[^.]*
           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
       - uses: actions/upload-artifact@v2
         with:
         with:
           name: source
           name: source