Skip to content

Commit d49270f

Browse files
committed
fix: CI package build
1 parent 8cda65e commit d49270f

3 files changed

Lines changed: 28 additions & 22 deletions

File tree

.github/actions/setup/action.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,3 @@ runs:
5151
run: |
5252
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
5353
54-
- name: Setup vcpkg (Windows)
55-
shell: bash
56-
if: ${{ inputs.os == 'windows-latest' }}
57-
run: |
58-
unset VCPKG_ROOT
59-
git clone https://github.com/microsoft/vcpkg.git
60-
cd vcpkg
61-
git checkout "$VCPKG_COMMIT"
62-
./bootstrap-vcpkg.bat
63-
echo "VCPKG_ROOT=${GITHUB_WORKSPACE}/vcpkg" >> "$GITHUB_ENV"

.github/workflows/build.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,24 @@ jobs:
4949
with:
5050
os: ${{ matrix.os }}
5151

52-
- name: 📋 Install MacOS Dependencies
53-
if: ${{ matrix.os == 'macos-latest' }}
54-
run: brew install vtk embree tbb
55-
56-
- name: Create vcpkg binary cache dir (Windows)
57-
if: ${{ matrix.os == 'windows-latest' }}
52+
- name: 🖥️ Setup vcpkg (Windows)
5853
shell: pwsh
54+
if: ${{ matrix.os == 'windows-latest' }}
5955
run: |
56+
Remove-Item Env:VCPKG_ROOT -ErrorAction SilentlyContinue
57+
58+
git clone https://github.com/microsoft/vcpkg.git
59+
git -C vcpkg checkout $env:VCPKG_COMMIT
60+
& .\vcpkg\bootstrap-vcpkg.bat
61+
62+
"VCPKG_ROOT=$($env:GITHUB_WORKSPACE)\vcpkg" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
63+
6064
New-Item -ItemType Directory -Force -Path "${{ env.VCPKG_DEFAULT_BINARY_CACHE }}"
6165
66+
- name: 📋 Install MacOS Dependencies
67+
if: ${{ matrix.os == 'macos-latest' }}
68+
run: brew install vtk embree tbb
69+
6270
- name: 🦥 Cache vcpkg binary (Windows)
6371
if: ${{ matrix.os == 'windows-latest' }}
6472
uses: actions/cache@v5

.github/workflows/python.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,24 @@ jobs:
4646
with:
4747
os: ${{ matrix.os }}
4848

49-
- name: 📋 Install MacOS Dependencies
50-
if: ${{ matrix.os == 'macos-latest' }}
51-
run: brew install embree tbb vtk
52-
53-
- name: Create vcpkg binary cache dir
54-
if: ${{ matrix.os == 'windows-latest' }}
49+
- name: 🖥️ Setup vcpkg (Windows)
5550
shell: pwsh
51+
if: ${{ matrix.os == 'windows-latest' }}
5652
run: |
53+
Remove-Item Env:VCPKG_ROOT -ErrorAction SilentlyContinue
54+
55+
git clone https://github.com/microsoft/vcpkg.git
56+
git -C vcpkg checkout $env:VCPKG_COMMIT
57+
& .\vcpkg\bootstrap-vcpkg.bat
58+
59+
"VCPKG_ROOT=$($env:GITHUB_WORKSPACE)\vcpkg" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
60+
5761
New-Item -ItemType Directory -Force -Path "${{ env.VCPKG_DEFAULT_BINARY_CACHE }}"
5862
63+
- name: 📋 Install MacOS Dependencies
64+
if: ${{ matrix.os == 'macos-latest' }}
65+
run: brew install embree tbb vtk
66+
5967
- name: 🦥 Cache vcpkg binary
6068
if: ${{ matrix.os == 'windows-latest' }}
6169
uses: actions/cache@v5

0 commit comments

Comments
 (0)