diff --git a/.github/test.sh b/.github/test.sh index 0caeca364..362020f3d 100755 --- a/.github/test.sh +++ b/.github/test.sh @@ -9,7 +9,11 @@ status=0 perl vvp_reg.pl || status=1 -perl vpi_reg.pl --with-pli1 || status=1 +if [ "x$1" = "xno-pli1" ] ; then + perl vpi_reg.pl || status=1 +else + perl vpi_reg.pl --with-pli1 || status=1 +fi python3 vvp_reg.py || status=1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12f2ab2fb..d0359c50e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,9 +77,9 @@ jobs: fail-fast: false matrix: include: - - { msystem: MINGW64, env: x86_64 } - - { msystem: UCRT64, env: ucrt-x86_64 } - - { msystem: CLANG64, env: clang-x86_64 } + - { msystem: MINGW64, env: x86_64 opt: pli1 } + - { msystem: UCRT64, env: ucrt-x86_64 opt: pli1 } + - { msystem: CLANG64, env: clang-x86_64 opt: no-pli1 } name: 🟪 ${{ matrix.msystem}} defaults: run: @@ -110,7 +110,9 @@ jobs: - name: Build and check run: | cd msys2 - export IVL_CONFIG_OPTIONS="--enable-libveriuser" + if [ ${{ matrix.opt }} = "pli1" ] ; then + export IVL_CONFIG_OPTIONS="--enable-libveriuser" + fi makepkg-mingw --noconfirm --noprogressbar -sCLf - name: Install @@ -118,7 +120,7 @@ jobs: - name: Test run: | - ./.github/test.sh + ./.github/test.sh ${{ matrix.opt }} - uses: actions/upload-artifact@v4 with: