fix: 3.0-windows-build.yml jom concurrent

taosdata · Jun 8, 2023 · 3705347 · 3705347
1 parent c4c755a
commit 3705347
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml
@@ -85,15 +85,17 @@ jobs:
           mkdir debug
 
       - uses: ilammy/msvc-dev-cmd@v1
+
       - name: cmake first TDengine
         if: |
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
+          cl.exe
           cd TDengine/debug
-          cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} && jom -j 8 && jom install
+          cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true && jom /j 2 && jom install
 
       - name: Checkout TDengine's taos-tools to PR number
         if: |
@@ -121,15 +123,21 @@ jobs:
           toolchain: stable
 
       - uses: ilammy/msvc-dev-cmd@v1
+
       - name: Build & Install TDengine
         if:
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
-          cd TDengine/debug
-          cmake .. -G "NMake Makefiles JOM" -DBUILD_HTTP=false -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true && jom -j8 && jom install
+          cl.exe
+          Remove-Item TDengine\debug
+          cd TDengine
+          mkdir debug
+          cd debug
+          cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true && jom /j 2 && jom install
+          #cmake .. -G "NMake Makefiles" -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true && nmake && nmake install
 
           #      - name: taosdump codec Test
           #        if: