[llvm-branch-commits] [llvm] Use container on Linux to run llvm-project-tests workflow (#81349) (PR #81807)
Tom Stellard via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Feb 16 12:23:26 PST 2024
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/81807
>From f40655f940d7d070da09cd4ae6db0fad74fd716e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 14 Feb 2024 16:05:52 -0800
Subject: [PATCH] Use container on Linux to run llvm-project-tests workflow
(#81349)
(cherry picked from commit fe20a759fcd20e1755ea1b34c5e6447a787925dc)
---
.github/workflows/llvm-project-tests.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 68b4a68d1af984..43b90193406fc9 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -58,6 +58,10 @@ jobs:
lit-tests:
name: Lit Tests
runs-on: ${{ matrix.os }}
+ container:
+ image: ${{(startsWith(matrix.os, 'ubuntu') && 'ghcr.io/llvm/ci-ubuntu-22.04:latest') || null}}
+ volumes:
+ - /mnt/:/mnt/
strategy:
fail-fast: false
matrix:
@@ -77,6 +81,7 @@ jobs:
with:
python-version: ${{ inputs.python_version }}
- name: Install Ninja
+ if: runner.os != 'Linux'
uses: llvm/actions/install-ninja at main
# actions/checkout deletes any existing files in the new git directory,
# so this needs to either run before ccache-action or it has to use
@@ -108,8 +113,8 @@ jobs:
run: |
if [ "${{ runner.os }}" == "Linux" ]; then
builddir="/mnt/build/"
- sudo mkdir -p $builddir
- sudo chown `whoami`:`whoami` $builddir
+ mkdir -p $builddir
+ extra_cmake_args="-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang"
else
builddir="$(pwd)"/build
fi
@@ -123,6 +128,7 @@ jobs:
-DLLDB_INCLUDE_TESTS=OFF \
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
+ $extra_cmake_args \
${{ inputs.extra_cmake_args }}
ninja -C "$builddir" '${{ inputs.build_target }}'
More information about the llvm-branch-commits
mailing list