Skip to content

Commit

Permalink
Remove vcpkg from CI
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Jakubowski <[email protected]>
  • Loading branch information
tomjakubowski committed Nov 5, 2024
1 parent 5c5e6a2 commit a8d6c14
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 42 deletions.
22 changes: 0 additions & 22 deletions .github/actions/install-deps/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ inputs:
default: "false"
description: "Don't use cache from previous builds"

outputs:
VCPKG_INSTALLATION_ROOT:
description: "The output of vcpkg install path"
value: ${{ steps.vcpkg-step.outputs.VCPKG_INSTALLATION_ROOT }}

runs:
using: "composite"
steps:
Expand Down Expand Up @@ -111,23 +106,6 @@ runs:
# with:
# key: ${{ github.job }}-${{ matrix.os }}

- name: Windows init steps (vc143)
id: vcpkg-step
shell: pwsh
run: |
vcpkg.exe install boost-thread boost-algorithm boost-filesystem boost-multi-index boost-multiprecision boost-program-options boost-system boost-unordered boost-uuid
vcpkg.exe integrate install
echo "VCPKG_INSTALLATION_ROOT=${env:VCPKG_INSTALLATION_ROOT}"
echo "VCPKG_INSTALLATION_ROOT=${env:VCPKG_INSTALLATION_ROOT}" >> $env:GITHUB_OUTPUT
echo "${env:VCPKG_INSTALLATION_ROOT}" >> $env:GITHUB_PATH
echo "VCPKG_ROOT=${env:VCPKG_INSTALLATION_ROOT}" >> $env:GITHUB_ENV
dir env:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKG_PLATFORM_TOOLSET: v143
if: ${{ runner.os == 'Windows' && inputs.cpp == 'true' }}

# https://github.com/apache/arrow/issues/38391
- if: ${{ runner.os == 'macOS' }}
shell: bash
Expand Down
20 changes: 0 additions & 20 deletions rust/perspective-server/build/psp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,6 @@ pub fn cmake_build() -> Result<Option<PathBuf>, std::io::Error> {
dst.define("PSP_WASM_BUILD", "0");
}

if cfg!(windows) {
match std::env::var("VCPKG_ROOT") {
Ok(vcpkg_root) => {
dst.define(
"CMAKE_TOOLCHAIN_FILE",
format!(
"{}/scripts/buildsystems/vcpkg.cmake",
vcpkg_root.replace("\\", "/")
),
);
},
Err(_) => {
println!(
"cargo:warning=MESSAGE VCPKG_ROOT not set in environment, not setting \
CMAKE_TOOLCHAIN_FILE"
)
},
}
}

if std::env::var("CARGO_FEATURE_PYTHON").is_ok() {
dst.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON");
dst.define("PSP_PYTHON_BUILD", "1");
Expand Down

0 comments on commit a8d6c14

Please sign in to comment.