Skip to content

Commit

Permalink
Fix MinGW build failures. (#4488)
Browse files Browse the repository at this point in the history
---
TYPE: NO_HISTORY
  • Loading branch information
teo-tsirpanis authored Nov 3, 2023
1 parent 4c75bd6 commit f055b0f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
16 changes: 16 additions & 0 deletions .github/workflows/build-rtools40.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Get vcpkg commit to checkout
id: vcpkg_commit
shell: bash
run: |
echo "ref=$(grep -oP '(?<=set\(VCPKG_COMMIT_STRING )\w*' cmake/Options/TileDBToolchain.cmake | head -n 1)" >> "$GITHUB_OUTPUT"
# We clone vcpkg ourselves because having FetchContent do it inside
# the build directory causes compilation errors due to long paths.
- name: Checkout vcpkg repository
uses: actions/checkout@v3
with:
repository: microsoft/vcpkg
path: vcpkg
ref: ${{ steps.vcpkg_commit.outputs.ref }}
# Vcpkg requires fetching all commits.
fetch-depth: 0
# Configure required environment variables for vcpkg to use
# GitHub's Action Cache
- uses: actions/github-script@v6
Expand All @@ -35,6 +50,7 @@ jobs:
TILEDB_HOME: ${{ github.workspace }}
MINGW_ARCH: ${{ matrix.msystem }}
VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
shell: c:\rtools40\usr\bin\bash.exe --login {0}
- name: "Upload binaries"
uses: actions/upload-artifact@v3
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ CMakeUserPresets.json
docs/.quarto
# Let CI build this
/docs

vcpkg
external/vcpkg
2 changes: 1 addition & 1 deletion scripts/ci/print_logs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
set -e pipefail
# Display log files if the build failed
echo "Dumping log files for failed build"
for f in $(find $GITHUB_WORKSPACE/{build,external} -name *.log);
for f in $(find $GITHUB_WORKSPACE/build -name *.log);
do
echo "::group::$f"
cat $f
Expand Down

0 comments on commit f055b0f

Please sign in to comment.