From ed156c1fc90e2b42e84f52d7d249c850fb12f061 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 18 Jul 2023 01:02:42 +0800 Subject: [PATCH] fix win cicd, revert back to vs2019 --- .github/workflows/build_win.yml | 8 +++++--- build_release_vs2022.bat | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 8f0a99066..5a8c11eb0 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -10,6 +10,7 @@ on: - 'version.inc' - 'bbl/**' - 'resources/**' + - '.github/workflows/build_win.yml' pull_request: branches: @@ -20,6 +21,7 @@ on: - 'version.inc' - 'bbl/**' - 'resources/**' + - '.github/workflows/build_win.yml' jobs: build_win64: @@ -36,11 +38,11 @@ jobs: - run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep - name: download deps shell: powershell - run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/4/OrcaSlicer_dep_16Jul2023.zip", "$env:temp\OrcaSlicer_dep_16Jul2023.zip")' + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/4/OrcaSlicer_dep_18Jul2023.zip", "$env:temp\OrcaSlicer_dep_18Jul2023.zip")' - name: extract deps working-directory: ${{ github.workspace }}/deps/build shell: cmd - run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_16Jul2023.zip' + run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_18Jul2023.zip' - run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep" @@ -63,7 +65,7 @@ jobs: - name: Build studio working-directory: ${{ github.workspace }} - run: .\build_release_vs2022.bat studio + run: .\build_release.bat studio # - name: pack app # working-directory: ${{ github.workspace }}/build diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat index c06eaf8d5..ea5f2f8b9 100644 --- a/build_release_vs2022.bat +++ b/build_release_vs2022.bat @@ -8,7 +8,7 @@ if "%1"=="studio" ( ) echo "building deps.." cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release -@REM cmake --build . --config Release --target ALL_BUILD -- -m +cmake --build . --config Release --target ALL_BUILD -- -m if "%1"=="deps" exit /b 0