diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml index e7b4ef85..23e87e16 100644 --- a/.github/workflows/build-new.yml +++ b/.github/workflows/build-new.yml @@ -42,7 +42,7 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.config.arch }} - name: Upload logs uses: actions/upload-artifact@v3 - if: failure() + if: failure() && ${{ startsWith(matrix.config.os, 'macos') }} with: name: logs-${{ matrix.config.os }}-${{ matrix.config.arch }} path: /Users/runner/work/vcpkg/buildtrees/*/*.log diff --git a/package/install-colmap-macos.sh b/package/install-colmap-macos.sh index fe3ebbd6..b7d69ff2 100755 --- a/package/install-colmap-macos.sh +++ b/package/install-colmap-macos.sh @@ -32,7 +32,7 @@ cd ${CURRDIR} git clone https://github.com/microsoft/vcpkg ${VCPKG_INSTALLATION_ROOT} cd ${VCPKG_INSTALLATION_ROOT} ./bootstrap-vcpkg.sh -./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} boost-algorithm boost-filesystem boost-graph boost-heap boost-program-options boost-property-map boost-property-tree boost-regex boost-system ceres[lapack,suitesparse] eigen3 flann freeimage metis gflags glog gtest sqlite3 +./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} boost-algorithm boost-filesystem boost-graph boost-heap boost-program-options boost-property-map boost-property-tree boost-regex boost-system ceres suitesparse eigen3 flann freeimage metis gflags glog gtest sqlite3 ./vcpkg integrate install cd ${CURRDIR}