Skip to content

Commit 147fabc

Browse files
committed
Last try for static vcpkg
1 parent fc4d54c commit 147fabc

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

.github/workflows/release-binaries.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
with:
7373
python-version: '3.13'
7474
- name: Install libxml2
75+
if:false
7576
shell: bash
7677
env:
7778
VCPKG_BUILD_TYPE: release
@@ -89,6 +90,7 @@ jobs:
8990
find /c/vcpkg -iname 'libxml*.lib'
9091
9192
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
93+
if: false
9294
with:
9395
name: libxml2
9496
path: |
@@ -251,7 +253,7 @@ jobs:
251253
echo "build-prefix=$build_prefix" >> $GITHUB_OUTPUT
252254
253255
- name: Install libxml2 for Windows
254-
if: runner.os == 'Windows'
256+
if: runner.os == 'Windows' && false
255257
run: |
256258
# Build libxml2 for windows
257259
curl -O https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.12/libxml2-v2.9.12.tar.gz
@@ -293,11 +295,25 @@ jobs:
293295
#ls -l /c/vcpkg/packages/libxml2_x64-windows-static/include/libxml2/libxml
294296
# There were some issues on the ARM64 MacOS runners with trying to build x86 object,
295297
# so we need to set some extra cmake flags to disable this.
296-
cmake -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
298+
cmake --debug-trycompile -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
297299
${{ needs.prepare.outputs.target-cmake-flags }} \
300+
-DLLVM_ENABLE_LIBXML2=FORCE_ON \
301+
-DLIBXML2_LIBRARIES=/c/vcpkg/packages/libxml2_x64-windows-static/lib/libxml2s.lib \
302+
-DLIBXML2_INCLUDE_DIR=/c/vcpkg/packages/libxml2_x64-windows-static/include/libxml2 \
303+
-DLIBXML2_DEFINITIONS=-DLIBXML_STATIC \
298304
-C clang/cmake/caches/Release.cmake \
299305
-DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
300306
307+
- name: Save build
308+
if: failure() && runner.os == 'Windows'
309+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
310+
with:
311+
name: build
312+
# Due to path differences on Windows when running in bash vs running on node,
313+
# we need to search for files in the current workspace.
314+
path: |
315+
build
316+
301317
- name: Build
302318
shell: bash
303319
run: |

0 commit comments

Comments
 (0)