Skip to content

Commit a832b41

Browse files
authored
Update Windows-arm.yml to use reusable action
1 parent 81b656f commit a832b41

File tree

1 file changed

+1
-67
lines changed

1 file changed

+1
-67
lines changed

.github/workflows/Windows-arm.yml

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -322,73 +322,7 @@ jobs:
322322
${{ matrix.cling=='On' && 'cling' || '' }}
323323
key: ${{ env.CLING_HASH }}-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-clang-${{ matrix.clang-runtime }}.x-patch-${{ hashFiles(format('patches/llvm/clang{0}-*.patch', matrix.clang-runtime)) || 'none' }}
324324

325-
- name: Build and Test/Install CppInterOp on Windows systems
326-
run: |
327-
#until https://github.com/compiler-research/CppInterOp/issues/188 is solved
328-
$env:PWD_DIR= $PWD.Path
329-
330-
$env:LLVM_DIR="$env:PWD_DIR\llvm-project"
331-
echo "LLVM_DIR=$env:LLVM_DIR"
332-
echo "LLVM_DIR=$env:LLVM_DIR" >> $env:GITHUB_ENV
333-
334-
$env:LLVM_BUILD_DIR="$env:PWD_DIR\llvm-project\build"
335-
echo "LLVM_BUILD_DIR=$env:LLVM_BUILD_DIR"
336-
echo "LLVM_BUILD_DIR=$env:LLVM_BUILD_DIR" >> $env:GITHUB_ENV
337-
338-
if ( "${{ matrix.cling }}" -imatch "On" )
339-
{
340-
$env:CLING_DIR="$env:PWD_DIR\cling"
341-
echo "CLING_DIR=$env:CLING_DIR"
342-
echo "CLING_DIR=$env:CLING_DIR" >> $env:GITHUB_ENV
343-
344-
$env:CLING_BUILD_DIR="$env:PWD_DIR\cling\build"
345-
echo "CLING_BUILD_DIR=$env:CLING_BUILD_DIR"
346-
echo "CLING_BUILD_DIR=$env:CLING_BUILD_DIR" >> $env:GITHUB_ENV
347-
348-
$env:CPLUS_INCLUDE_PATH="$env:CLING_DIR\tools\cling\include;$env:CLING_BUILD_DIR\include;$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
349-
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH"
350-
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH" >> $env:GITHUB_ENV
351-
}
352-
else
353-
{
354-
$env:CPLUS_INCLUDE_PATH="$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
355-
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH"
356-
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH" >> $env:GITHUB_ENV
357-
}
358-
359-
$env:CB_PYTHON_DIR="$env:PWD_DIR\cppyy-backend\python"
360-
echo "CB_PYTHON_DIR=$env:CB_PYTHON_DIR"
361-
echo "CB_PYTHON_DIR=$env:CB_PYTHON_DIR" >> $env:GITHUB_ENV
362-
363-
$env:CPPINTEROP_DIR="$env:CB_PYTHON_DIR\cppyy-backend"
364-
echo "CPPINTEROP_DIR=$env:CPPINTEROP_DIR"
365-
echo "CPPINTEROP_DIR=$env:CPPINTEROP_DIR" >> $env:GITHUB_ENV
366-
367-
# Build CppInterOp next to cling and llvm-project.
368-
mkdir build
369-
cd build
370-
$env:CPPINTEROP_BUILD_DIR="$env:PWD_DIR"
371-
echo "CPPINTEROP_BUILD_DIR=$env:CPPINTEROP_BUILD_DIR"
372-
echo "CPPINTEROP_BUILD_DIR=$env:CPPINTEROP_BUILD_DIR" >> $env:GITHUB_ENV
373-
if ( "${{ matrix.cling }}" -imatch "On" )
374-
{
375-
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
376-
-DCPPINTEROP_USE_CLING=ON `
377-
-DCPPINTEROP_USE_REPL=OFF `
378-
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
379-
-DLLVM_DIR="$env:LLVM_BUILD_DIR" `
380-
-DLLVM_ENABLE_WERROR=On `
381-
-DClang_DIR="$env:LLVM_BUILD_DIR" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
382-
}
383-
else
384-
{
385-
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
386-
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
387-
-DLLVM_ENABLE_WERROR=On `
388-
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
389-
cmake --build . --config ${{ env.BUILD_TYPE }} --target googletest --parallel ${{ env.ncpus }}
390-
}
391-
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
325+
- uses: ./.github/actions/Build_and_Test_CppInterOp
392326

393327
- name: Setup tmate session
394328
if: ${{ failure() && runner.debug }}

0 commit comments

Comments
 (0)