From a5a4b139902f54603ae7b703361d6f48f56e2e26 Mon Sep 17 00:00:00 2001
From: cdryzun <yangzun@treesir.pub>
Date: Thu, 24 Aug 2023 15:50:10 +0800
Subject: [PATCH] test -1

---
 .gitea/workflows/ci.yaml | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 7989b9b..3aaf775 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -21,17 +21,14 @@ jobs:
           curl -v -k -o walrus -LO "${{ secrets.CI_WALRUS_SERVER }}/cli?arch=amd64&os=linux"
           chmod +x ./walrus
 
-      # - name: Set env
-      #   run: echo "GITHUB_SHA_SHORT=\'{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }\'" >> $GITHUB_ENV
-        
       - name: Deploy
         run: |
-          # Set Run envlist
-          export ATTRIBUTES='{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }'
+          # # Set Run envlist
+          # export ATTRIBUTES=
 
           # test
-          echo "$ATTRIBUTES"
-          printenv
+          # echo "$ATTRIBUTES"
+          # printenv
 
           # Setup CLI config
           ./walrus config setup \
@@ -40,19 +37,17 @@ jobs:
             --environment dev \
             --token '${{ secrets.CI_WALRUS_TOKEN }}
 
-
           # # Build and deploy from source code
-          # ./walrus service create \
-          #   --name simple-web-service \
-          #   --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
-          #   --attributes "${ATTRIBUTES}" \
-          #   -d
+          ./walrus service create \
+            --name simple-web-service \
+            --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
+            --attributes '{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }' \
+            -d
 
-          # # Upgrade deploy
-          # if [ ! $(echo $?) -eq '0' ];then
-          #     ./walrus service upgrade simple-web-service \
-          #        --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
-          #        --attributes "${ATTRIBUTES}"
-          # fi
+          if [ ! $(echo $?) -eq '0' ];then
+              ./walrus service upgrade simple-web-service \
+                 --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
+                 --attributes '{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }'
+          fi
 
           
\ No newline at end of file