+ Test

.github/workflows/unit-test.yml

@@ -9,7 +9,7 @@ env:
   # 象传服务配置
   XIANG_MODE: debug
   XIANG_SOURCE: ${{ github.WORKSPACE }}
-  XIANG_ROOT: fs:///${{ github.WORKSPACE }}/app
+  XIANG_ROOT: fs://${{ github.WORKSPACE }}/app
 
   # 服务配置
   XIANG_SERVICE_DEBUG: true
@@ -20,8 +20,6 @@ env:
   # 数据库配置
   XIANG_DB_DEBUG: true
   XIANG_DB_DRIVER: "mysql"
-  XIANG_DB_PRIMARY: "root:123456@tcp(db-server:3308)/xun?charset=utf8mb4&parseTime=True&loc=Local"
-  XIANG_DB_SECONDARY: "root:123456@tcp(db-server:3308)/xun?charset=utf8mb4&parseTime=True&loc=Local"
   XIANG_DB_AESKEY: "ZLX:XzT&f6refeCh-ro*r@"
 
   # JWT配置
@@ -30,13 +28,13 @@ env:
 
   # 存储配置
   XIANG_STOR_DEBUG: true
-  XIANG_STOR_PATH: "fs:///${{ github.WORKSPACE }}/upload"
+  XIANG_STOR_PATH: "fs://${{ github.WORKSPACE }}/upload"
 
   # 日志配置
-  XIANG_LOG_ACCESS: "fs:///${{ github.WORKSPACE }}/logs/access.log"
-  XIANG_LOG_ERROR: "fs:///${{ github.WORKSPACE }}/logs/error.log"
-  XIANG_LOG_DB: "fs:///${{ github.WORKSPACE }}/logs/db.log"
-  XIANG_LOG_PLUGIN: "fs:///${{ github.WORKSPACE }}/logs/plugin.log"
+  XIANG_LOG_ACCESS: "fs://${{ github.WORKSPACE }}/logs/access.log"
+  XIANG_LOG_ERROR: "fs://${{ github.WORKSPACE }}/logs/error.log"
+  XIANG_LOG_DB: "fs://${{ github.WORKSPACE }}/logs/db.log"
+  XIANG_LOG_PLUGIN: "fs://${{ github.WORKSPACE }}/logs/plugin.log"
 
 jobs:
   unit-test:
@@ -90,26 +88,29 @@ jobs:
       - name: Setup ENV & Host
         run: |
           sudo echo "127.0.0.1 local.iqka.com" | sudo tee -a /etc/hosts 
-          echo "XUN_UNIT_NAME=$DB_NAME" >> $GITHUB_ENV
-          echo "XUN_UNIT_DRIVER=$DB_DRIVER" >> $GITHUB_ENV
-          echo "XUN_UNIT_LOG=$HOME/${{ matrix.db }}-${{ matrix.go }}.log" >> $GITHUB_ENV
-          echo "ls -l ."
+          echo "XIANG_DB_DRIVER=$DB_DRIVER" >> $GITHUB_ENV
+          ls -l .
 
-      # - name: Run Test
-      #   env:
-      #     PASSWORD: ${{ secrets.UNIT_PASS }}
-      #   run: |
-      #     make vet
-      #     make fmt-check
-      #     make misspell-check
+      - name: Run Test
+        env:
+          PASSWORD: ${{ secrets.UNIT_PASS }}
+        run: |
+          make vet
+          make fmt-check
+          make misspell-check
+          make plugin
+          make migrate
+          make test
 
-      #     if [ "$DB_DRIVER" = "mysql" ]; then
-      #       XUN_UNIT_SOURCE="$DB_USER:$PASSWORD@$DB_HOST" make test
-      #     elif [ "$DB_DRIVER" = "postgres" ]; then
-      #       XUN_UNIT_SOURCE="postgres://$DB_USER:$PASSWORD@$DB_HOST" make test
-      #     else
-      #       XUN_UNIT_SOURCE="$DB_HOST" make test
-      #     fi
+          if [ "$DB_DRIVER" = "mysql" ]; then
+            XIANG_DB_PRIMARY="$DB_USER:$PASSWORD@$DB_HOST" make test
+          elif [ "$DB_DRIVER" = "postgres" ]; then
+            XIANG_DB_PRIMARY="postgres://$DB_USER:$PASSWORD@$DB_HOST" make test
+          else
+            XIANG_DB_PRIMARY="$DB_HOST" make test
+          fi
 
-      # - name: Codecov Report
-      #   uses: codecov/codecov-action@v2
+      - name: Codecov Report
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

go.mod

@@ -39,6 +39,6 @@ require (
 
 // go env -w GOPRIVATE=github.com/yaoapp/*
 
-// replace github.com/yaoapp/kun => ../kun // kun local
-// replace github.com/yaoapp/xun => ../xun // gou local
-// replace github.com/yaoapp/gou => ../gou // gou local
+replace github.com/yaoapp/kun => ../kun // kun local
+replace github.com/yaoapp/xun => ../xun // gou local
+replace github.com/yaoapp/gou => ../gou // gou local