Switch back to lit.py from submodule.

ScottTodd · Feb 1, 2024 · 92d1355 · 92d1355
1 parent 82be085
commit 92d1355
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml
@@ -22,6 +22,10 @@ on:
     #     description: "Run ID for the build_package.yml workflow that triggered this workflow"
     #     required: true
 
+# TODO(scotttodd): switch to runtime submodules only
+#   * Use a Docker image with `lit` installed (`python -m pip install lit`)
+#   * `run: ./build_tools/scripts/git/update_runtime_submodules.sh`
+
 jobs:
   linux_x86_64_cpu:
     name: Test on Linux (x86_64) CPU
@@ -45,5 +49,6 @@ jobs:
       - name: "Testing package"
         run: |
           ./build_tools/github_actions/docker_run.sh \
+            --env LLVM_EXTERNAL_LIT=$PWD/third_party/llvm-project/llvm/utils/lit/lit.py \
             gcr.io/iree-oss/base@sha256:61e9aae211007dbad95e1f429e9e5121fd5968c204791038424979c21146cf75 \
           ./build_tools/pkgci/test_package.sh iree-dist
diff --git a/build_tools/pkgci/test_package.sh b/build_tools/pkgci/test_package.sh
@@ -31,9 +31,6 @@ set -x
 PACKAGE_DIR="$1"
 SOURCE_DIR_ROOT=$(git rev-parse --show-toplevel)
 TEST_BUILD_DIR="${TEST_BUILD_DIR:-build-tests}"
-
-# TODO(scotttodd): include this in the Dockerfile
-python -m pip install lit
 LLVM_EXTERNAL_LIT="${LLVM_EXTERNAL_LIT:-$(which lit)}"
 
 # Respect user settings, but default to as many test actions as we have cores.