Use only runtime submodules, use installed lit.

ScottTodd · Feb 1, 2024 · 89dc47a · 89dc47a
1 parent 091f2e0
commit 89dc47a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml
@@ -29,8 +29,8 @@ jobs:
     steps:
       - name: "Checking out repository"
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
-        # with:
-        #   submodules: true
+      - name: "Checking out runtime submodules"
+        run: ./build_tools/scripts/git/update_runtime_submodules.sh
       - name: "Downloading release package"
         uses: robinraju/release-downloader@368754b9c6f47c345fcfbf42bcb577c2f0f5f395 # v1.9
         with:
@@ -45,14 +45,11 @@ jobs:
       - name: "Inspecting package archive"
         run: |
           ls iree-dist
-      - name: "Installing lit from pip"
+      - name: "Installing dependencies"
         run: |
           python -m pip install lit
-      - name: "Looking for lit"
+      - name: "Testing package"
         run: |
-          which lit
-      # - name: "Testing package"
-      #   run: |
-      #     ./build_tools/github_actions/docker_run.sh \
-      #       gcr.io/iree-oss/base@sha256:61e9aae211007dbad95e1f429e9e5121fd5968c204791038424979c21146cf75 \
-      #     ./build_tools/pkgci/test_package.sh iree-dist
+          ./build_tools/github_actions/docker_run.sh \
+            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
@@ -156,7 +156,7 @@ cmake_args=(
   "-DIREE_BUILD_PYTHON_BINDINGS=OFF"
   "-DIREE_BUILD_COMPILER=OFF"
   "-DIREE_HOST_BIN_DIR=${PACKAGE_DIR?}/bin"
-  "-DLLVM_EXTERNAL_LIT=${SOURCE_DIR_ROOT?}/third_party/llvm-project/llvm/utils/lit/lit.py"
+  "-DLLVM_EXTERNAL_LIT=$(which lit)"
 )
 cmake_args+=(${cmake_config_options[@]})