From 17d6b6cfcba626a45f0fa085290176a98fe91aa7 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 23 Jun 2024 22:01:41 +0800 Subject: [PATCH] skip vs2017 swiftshader --- .github/workflows/test-coverage.yml | 51 +++++++++++++++++++++++++++++ .github/workflows/windows.yml | 10 +++--- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 3695bbed2bad..1384cc43dce7 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -52,11 +52,62 @@ jobs: lcov -r lcov.info '*/install/*' -o lcov.info lcov -r lcov.info '*/build/*' -o lcov.info lcov --list lcov.info + - name: codecov + id: codecov + continue-on-error: true + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: build/lcov.info + - name: codecov-vlen256-retry-1 + continue-on-error: true + id: codecov-vlen256-retry-1 + if: steps.codecov.outcome=='failure' + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: build/lcov.info + - name: codecov-vlen256-retry-2 + continue-on-error: true + id: codecov-vlen256-retry-2 + if: steps.codecov-vlen256-retry-1.outcome=='failure' + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: build/lcov.info + - name: codecov-vlen256-retry-3 + continue-on-error: true + id: codecov-vlen256-retry-3 + if: steps.codecov-vlen256-retry-2.outcome=='failure' + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: build/lcov.info + - name: codecov-vlen256-retry-4 + continue-on-error: true + id: codecov-vlen256-retry-4 + if: steps.codecov-vlen256-retry-3.outcome=='failure' uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} file: build/lcov.info + - name: codecov-vlen256-retry-5 + continue-on-error: true + id: codecov-vlen256-retry-5 + if: steps.codecov-vlen256-retry-4.outcome=='failure' + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: build/lcov.info + - name: set the status + if: always() + run: | + if ${{ steps.codecov.outcome=='success' || steps.codecov-vlen256-retry-1.outcome=='success' || steps.codecov-vlen256-retry-2.outcome=='success' || steps.codecov-vlen256-retry-3.outcome=='success' || steps.codecov-vlen256-retry-4.outcome=='success' || steps.codecov-vlen256-retry-5.outcome=='success' }}; then + echo fine + else + exit 1 + fi linux-gcc-x64-avx512-spr: runs-on: ubuntu-22.04 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ac426bf8cdc8..d099290a316c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -79,26 +79,26 @@ jobs: cmake --build . --config Release -j 4 cmake --build . --config Release --target install - name: cache-swiftshader - if: matrix.vs-version != 'vs2015' + if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' id: cache-swiftshader uses: actions/cache@v4 with: path: swiftshader-install key: swiftshader-${{ matrix.vs-version }}-x64-install-20240622 - name: checkout-swiftshader - if: matrix.vs-version != 'vs2015' && steps.cache-swiftshader.outputs.cache-hit != 'true' + if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' uses: actions/checkout@v4 with: repository: google/swiftshader path: swiftshader ref: de870ac7518fe2b6bb651ecc22fc36647cf7b986 - name: checkout-swiftshader-submodules - if: matrix.vs-version != 'vs2015' && steps.cache-swiftshader.outputs.cache-hit != 'true' + if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' run: | cd swiftshader git -c submodule."third_party/git-hooks".update=none submodule update --init --recursive - name: swiftshader - if: matrix.vs-version != 'vs2015' && steps.cache-swiftshader.outputs.cache-hit != 'true' + if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' run: | cd swiftshader mkdir build-${{ matrix.vs-version }}; cd build-${{ matrix.vs-version }} @@ -113,7 +113,7 @@ jobs: cmake -T ${{ matrix.toolset-version }},host=x64 -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\cmake" -DNCNN_VULKAN=ON -DNCNN_BUILD_TESTS=ON .. cmake --build . --config Release -j 4 - name: x64-test - if: matrix.vs-version != 'vs2015' + if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' run: | echo "[Processor]`nThreadCount=1`n" > build-x64/tests/Release/SwiftShader.ini Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64\tests'