From 15dc185681fa08f402001bc5c19d5d5df07d753a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 22 Jan 2023 14:41:51 +0800 Subject: [PATCH] update deps (#210) Signed-off-by: SoftFever Signed-off-by: SoftFever --- .github/workflows/build_mac_arm64.yml | 6 ++-- .github/workflows/build_win.yml | 44 +++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 62d5985ce..f7568996e 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -33,11 +33,11 @@ jobs: - name: Download and extract deps working-directory: ${{ github.workspace }} run: | - curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64.tar.gz - tar -zxvf BambuStudio_dep_arm64.tar.gz -C ${{ github.workspace }}/deps/build + curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz + tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep - rm BambuStudio_dep_arm64.tar.gz + rm BambuStudio_dep_arm64_21-01-2023.tar.gz - name: Build studio diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 4cdf8c54e..e504d511e 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -15,32 +15,32 @@ jobs: choco install strawberryperl - run: mkdir ${{ github.workspace }}/deps/build - run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep - # - name: download deps - # shell: powershell - # run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep.zip", "$env:temp\BambuStudio_dep.zip")' - # - name: extract deps - # working-directory: ${{ github.workspace }}/deps/build - # shell: cmd - # run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep.zip' + - name: download deps + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_21Jan2023.zip", "$env:temp\BambuStudio_dep_21Jan2023.zip")' + - name: extract deps + working-directory: ${{ github.workspace }}/deps/build + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_21Jan2023.zip' - # - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" + - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" - - name: build deps - id: cache_deps - uses: actions/cache@v3 - env: - cache-name: ${{ runner.os }}-cache-bambustudio_deps - with: - path: ${{ github.workspace }}/deps/build/BambuStudio_dep - key: ${{ runner.os }}-build-${{ env.cache-name }} + # - name: build deps + # id: cache_deps + # uses: actions/cache@v3 + # env: + # cache-name: ${{ runner.os }}-cache-bambustudio_deps + # with: + # path: ${{ github.workspace }}/deps/build/BambuStudio_dep + # key: ${{ runner.os }}-build-${{ env.cache-name }} - - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} - name: build deps - working-directory: ${{ github.workspace }} - continue-on-error: true - run: .\build_release.bat deps + # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} + # name: build deps + # working-directory: ${{ github.workspace }} + # continue-on-error: true + # run: .\build_release.bat deps - - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force + # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force - name: Build studio working-directory: ${{ github.workspace }}