diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 2c901ec..d0cc103 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -182,7 +182,7 @@ jobs: with: name: openfpga-build-${{ env.COMMIT_SHA1 }}-${{ matrix.msystem }} retention-days: 2 - path: ${{ env.SOURCE_DIR }}/openfpga-${{ env.COMMIT_SHA1 }}-${{ matrix.msystem }}.7z + path: openfpga/openfpga-${{ env.COMMIT_SHA1 }}-${{ matrix.msystem }}.7z overwrite: true build-msvc: @@ -213,6 +213,12 @@ jobs: choco install -y make choco install -y winflexbison choco install -y wget + wget https://github.com/oneapi-src/oneTBB/releases/download/v2020.3/tbb-2020.3-win.zip --directory-prefix=%CD% + cd tbb + echo ("TBB_INSTALL_DIR=%CD%") >> $env:GITHUB_ENV + echo ("TBB_ROOT_DIR=%CD%") >> $env:GITHUB_ENV + cd - + - name: Setup Python uses: actions/setup-python@v4.3.0 @@ -222,7 +228,7 @@ jobs: - name: Install libusb with vcpkg run: | - C:\vcpkg\vcpkg.exe install libusb tbb zlib gtk3 libx11 --triplet=x64-windows + C:\vcpkg\vcpkg.exe install libusb readline eigen3 zlib gtk3 libx11 --triplet=x64-windows C:\vcpkg\vcpkg.exe integrate install - name: Install nasm with choco