Update standalone.yml

chuntaojun · Sep 20, 2022 · 0d1a520 · 0d1a520
1 parent 24cb5a9
commit 0d1a520
Showing 1 changed file with 8 additions and 27 deletions.
diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml
@@ -40,6 +40,7 @@ jobs:
           GOARCH: ${{ matrix.goarch }}
           SERVER_VERSION: ${{ github.event.inputs.server_version }}
           CONSOLE_VERSION: ${{ github.event.inputs.console_version }}
+          LIMITER_VERSION: ${{ github.event.inputs.limiter_version }}
         run: |
           if [ ${GOOS} == "kubernetes" ];then
             set -e
@@ -49,9 +50,9 @@ jobs:
             cd ${workdir}
             cd deploy/standalone
 
-            sed -i "s/##POLARIS_SERVER_VERSION##/${SERVER_VERSION}/g" 03-polaris-server.yaml
-            sed -i "s/##POLARIS_CONSOLE_VERSION##/${CONSOLE_VERSION}/g" 03-polaris-server.yaml
-            sed -i "s/##POLARIS_PROMETHEUS_VERSION##/${SERVER_VERSION}/g" 04-prometheus.yaml
+            sed -i "s/##POLARIS_SERVER_VERSION##/${SERVER_VERSION}/g" k8s/03-polaris-server.yaml
+            sed -i "s/##POLARIS_CONSOLE_VERSION##/${CONSOLE_VERSION}/g" k8s/03-polaris-server.yaml
+            sed -i "s/##POLARIS_PROMETHEUS_VERSION##/${SERVER_VERSION}/g" k8s/04-prometheus.yaml
 
             cd ${cur}
 
@@ -64,7 +65,6 @@ jobs:
             PACKAGE_NAME=${DIR_NAME}.zip
             zip -r ${PACKAGE_NAME} ${DIR_NAME}
             mv ${PACKAGE_NAME} ../../
-            echo ::set-output name=name::${PACKAGE_NAME}
 
             # ---------------------- 出 docker-compose 安装包 ---------------------- 
             cd ${workdir}
@@ -83,7 +83,6 @@ jobs:
             DOCKER_COMPOSE_PACKAGE_NAME=${DOCKER_COMPOSE_DIR_NAME}.zip
             zip -r ${DOCKER_COMPOSE_PACKAGE_NAME} ${DOCKER_COMPOSE_DIR_NAME}
             mv ${DOCKER_COMPOSE_PACKAGE_NAME} ../../
-            echo ::set-output docker_compose_name=docker_compose_name::${DOCKER_COMPOSE_PACKAGE_NAME}
 
             # ---------------------- 出 helm 安装包 ---------------------- 
             cd ${workdir}
@@ -101,7 +100,9 @@ jobs:
             HELM_PACKAGE_NAME=${HELM_DIR_NAME}.zip
             zip -r ${HELM_PACKAGE_NAME} ${HELM_DIR_NAME}
             mv ${HELM_PACKAGE_NAME} ../../
-            echo ::set-output helm_name=helm_name::${HELM_PACKAGE_NAME}
+
+            ALL_ZIP_PKG="polaris*.zip"
+            echo ::set-output name=name::${ALL_ZIP_PKG}
             return
           else
             set -e
@@ -115,7 +116,7 @@ jobs:
             CONSOLE_PKG_NAME=polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${GOARCH}.zip
             wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris-console/releases/download/${CONSOLE_VERSION}/${CONSOLE_PKG_NAME} --no-check-certificate
             LIMITER_PKG_NAME=polaris-limiter-release_${CONSOLE_VERSION}.${GOOS}.${GOARCH}.zip
-            wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris-console/releases/download/${CONSOLE_VERSION}/${CONSOLE_PKG_NAME} --no-check-certificate
+            wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris-limiter/releases/download/${LIMITER_VERSION}/${LIMITER_PKG_NAME} --no-check-certificate
             if [ ${GOOS} == "windows" ];then
               wget -T10 -t3 https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.${GOOS}-${GOARCH}.zip
               mv ../vm/install-windows.bat ./install.bat
@@ -154,23 +155,3 @@ jobs:
           asset_path: ./${{ steps.build.outputs.name }}
           asset_name: ${{ steps.build.outputs.name }}
           asset_content_type: application/gzip
-
-      - name: Upload docker-compose asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release_by_tag.outputs.upload_url }}
-          asset_path: ./${{ steps.build.outputs.docker_compose_name }}
-          asset_name: ${{ steps.build.outputs.docker_compose_name }}
-          asset_content_type: application/gzip
-
-      - name: Upload helm asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release_by_tag.outputs.upload_url }}
-          asset_path: ./${{ steps.build.outputs.helm_name }}
-          asset_name: ${{ steps.build.outputs.helm_name }}
-          asset_content_type: application/gzip