Skip to content

Commit 80ce234

Browse files
author
Shao-Ce SUN
committed
fix windows build error in CI
1 parent 96ec779 commit 80ce234

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: LLDB-MI CI
22

33
on: [push, pull_request]
44

5-
jobs:
5+
jobs:
66
build_and_test:
77
name: Build LLDB-MI and run the testsuite
88

99
env:
1010
# CMake build type
1111
BUILD_TYPE: Release
12-
12+
1313
BUILD_PATH: "'${{github.workspace}}/build'"
1414

1515
runs-on: ${{matrix.os}}
@@ -23,48 +23,50 @@ jobs:
2323
if: matrix.os == 'ubuntu-latest'
2424

2525
- name: Checkout sources
26-
uses: actions/checkout@v2
27-
26+
uses: actions/checkout@v3
27+
2828
- name: Check format (Ubuntu)
2929
run: ${{github.workspace}}/.github/scripts/clang-format.sh
3030
if: matrix.os == 'ubuntu-latest'
3131

3232
- name: Install Ninja, LLVM, Clang and LLDB (Mac OS)
3333
run: |
3434
brew install ninja llvm
35-
echo "LLVM_CONFIG_PATH=$(brew --cellar llvm)/$(brew list --versions llvm | sed -E 's/llvm (.*)/\1/g')/lib/cmake/llvm" >> $GITHUB_ENV
35+
echo "LLVM_CONFIG_PATH=$(brew --cellar llvm)/$(brew list --versions llvm | sed -E 's/llvm (.*)/\1/g')/lib/cmake/llvm" >> $GITHUB_ENV
3636
if: matrix.os == 'macos-latest'
3737

3838
- name: Install Ninja (Windows)
3939
run: choco install -y --no-progress ninja
4040
if: matrix.os == 'windows-latest'
41-
41+
4242
- name: Download LLVM binaries (Windows)
4343
# Using not yet released feature 'check_artifacts'.
4444
uses: dawidd6/action-download-artifact@master
4545
with:
4646
workflow: ci.yml
4747
workflow_conclusion: success
48-
repo: tkrasnukha/install-llvm
48+
repo: sunshaoce/install-llvm
4949
# Get the last available artifact.
5050
check_artifacts: true
5151
if: matrix.os == 'windows-latest'
52-
52+
5353
# Required to find cl.exe
5454
- name: Setup devcmd (Windows)
5555
uses: ilammy/msvc-dev-cmd@v1
56+
with:
57+
arch: x86
5658
if: matrix.os == 'windows-latest'
57-
59+
5860
- name: Set up environment (Windows)
5961
run: |
6062
$LLVM_CONFIG_PATH = ("${{github.workspace}}").Replace("\", "/") + "/llvm-inst/lib/cmake/llvm"
6163
echo "LLVM_CONFIG_PATH='$LLVM_CONFIG_PATH'" >> $env:GITHUB_ENV
62-
64+
6365
$CC = (gcm "cl.exe" | select-object -ExpandProperty Definition)
6466
echo "CC='$CC'" >> $env:GITHUB_ENV
6567
echo "CXX='$CC'" >> $env:GITHUB_ENV
6668
if: matrix.os == 'windows-latest'
67-
69+
6870
- name: Configure CMake project
6971
run: |
7072
export LLVM_DIR=${{env.LLVM_CONFIG_PATH}}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
build
1+
build*/
2+
.vscode/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LLDB's machine interface driver.
44

55
# Build
66

7-
lldb-mi uses CMake to build. The only dependencies needed for lldb-mi are a C++14 compiler and LLDB itself (including its dependencies: Clang and LLVM). These dependencies should be installed in a way that they can be found via CMake's [`find_package`](https://cmake.org/cmake/help/latest/command/find_package.html) functionality. You need both the LLDB/Clang/LLVM headers and their compiled libraries for the build to work, but not the respective source files.
7+
lldb-mi uses CMake to build. The only dependencies needed for lldb-mi are a C++17 (since LLVM 16) compiler and LLDB itself (including its dependencies: Clang and LLVM). These dependencies should be installed in a way that they can be found via CMake's [`find_package`](https://cmake.org/cmake/help/latest/command/find_package.html) functionality. You need both the LLDB/Clang/LLVM headers and their compiled libraries for the build to work, but not the respective source files.
88

99
# Building against system LLDB
1010

0 commit comments

Comments
 (0)