Update the ci script

pwnsky · Sep 25, 2024 · ac1e385 · ac1e385
1 parent a5d1326
commit ac1e385
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,11 @@ jobs:
         os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
       - uses: actions/checkout@v3
+      - name: Updating submodule
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest' || matrix.os == 'windows-latest'
+        run: |
+          git submodule update
+
       - name: Building squick third party library for linux and macos
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
@@ -24,36 +29,36 @@ jobs:
       - name: Building sqkctl tools for linux and macos
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
-          cd tools && ./build_sqkctl.sh
+          cd res/ToolsSrc/sqkctl && ./build.sh
 
       - name: Building sqkctl tools for windows
         if: matrix.os == 'windows-latest'
         run: |
-          cd tools
-          .\build_sqkctl.bat no_pause
+          cd res\ToolsSrc\sqkctl
+          .\build.bat no_pause
           
       - name: Building squick project for linux and macos
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
-          cd tools && ./build_squick.sh
+          cd tools && ./build.sh
           
       - name: Building squick project for windows
         if: matrix.os == 'windows-latest'
         run: |
           cd tools
-          .\build_squick.bat no_pause
+          .\build.bat no_pause
           
       - name: Geneating deploy files for linux and macos
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
-          cd tools && ./generate_deploy.sh
+          cd tools && ./gen_deploy.sh
           cd ../deploy
           ls -al
           
       - name: Geneating deploy files for windows
         if: matrix.os == 'windows-latest'
         run: |
           cd tools
-          .\generate_deploy.bat no_pause
+          .\gen_deploy.bat no_pause
           cd ..\deploy
           dir
diff --git a/tools/build.bat b/tools/build.bat
@@ -11,9 +11,12 @@ set build_path=%project_path%\cache
 
 mkdir %build_path%
 
-call "proto2code.bat no_pause"
-call "generate_config.bat no_pause"
-call "init_runtime_dll.bat no_pause"
+cd %project_path%\res
+call ".\GenProtoCode.bat" server
+call ".\ExportTable.bat" server
+
+cd %project_path%\tools
+call "init_runtime_dll.bat" no_pause
 
 rem cmake 
 cd %build_path%\