From e06d68ecdb959a6dcf0c3c23258aec9b084b3ab5 Mon Sep 17 00:00:00 2001 From: nihuini Date: Tue, 13 Aug 2024 19:05:57 +0800 Subject: [PATCH] fix --- .github/workflows/release.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 825110399cc..2e875fc51e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2102,22 +2102,21 @@ jobs: cmake --build . --config Release -j 4 cmake --build . --config Release --target install - name: build-arm - if: matrix.opt.id == 'vs2019' || matrix.opt.id == 'vs2022' + if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143' run: | mkdir build-arm; cd build-arm cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A arm .. cmake --build . --config Release -j 4 cmake --build . --config Release --target install - name: build-arm64 - if: matrix.opt.id == 'vs2019' || matrix.opt.id == 'vs2022' + if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143' run: | mkdir build-arm64; cd build-arm64 cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A arm64 .. cmake --build . --config Release -j 4 cmake --build . --config Release --target install - - name: package - if: matrix.opt.id == 'vs2015' || matrix.opt.id == 'vs2017' + if: matrix.opt.toolset-version == 'v140' || matrix.opt.toolset-version == 'v141' run: | mkdir ${{ env.PACKAGENAME }} mkdir ${{ env.PACKAGENAME }}/x86 @@ -2126,7 +2125,7 @@ jobs: Copy-Item -Verbose -Recurse -Path "build-x64\install\*" -Destination "${{ env.PACKAGENAME }}\x64" 7z a -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }} - name: package - if: matrix.opt.id == 'vs2019' || matrix.opt.id == 'vs2022' + if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143' run: | mkdir ${{ env.PACKAGENAME }} mkdir ${{ env.PACKAGENAME }}/x86