copy stuff in build_test_cpp.sh

nod-ai · Aug 22, 2024 · e73a055 · e73a055
1 parent b830521
commit e73a055
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -70,9 +70,6 @@ jobs:
       - name: Create artifacts
         if: ${{ !cancelled() }}
         run: |
-          rm -f iree-install/bin/clang*
-          rm -f iree-install/bin/llvm-link*
-          cp ../iree-build/tools/testing/e2e/iree-e2e-matmul-test iree-install/bin
           tar cf iree-dist-linux.tar -C iree-install .
 
       - name: Upload artifacts

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -86,8 +86,6 @@ jobs:
       - name: Create artifacts
         if: ${{ !cancelled() }}
         run: |
-          rm -f iree-install/bin/clang*
-          rm -f iree-install/bin/llvm-link*
           tar cf iree-dist-windows.tar -C iree-install .
 
       - name: Upload artifacts

diff --git a/build_tools/ci/build_test_cpp.sh b/build_tools/ci/build_test_cpp.sh
@@ -107,3 +107,7 @@ fi
 
 # Show ccache stats.
 ccache --show-stats
+
+rm -f "$install_dir"/bin/clang*
+rm -f "$install_dir"/bin/llvm-link*
+cp "$build_dir"/tools/testing/e2e/iree-e2e-matmul-test "$install_dir"/bin
diff --git a/build_tools/ci/run_matmul_test.sh b/build_tools/ci/run_matmul_test.sh
@@ -450,7 +450,7 @@ function run_matmul_test() {
   echo "**** Running '${name}' matmul test ${total_num_runs} times (command ${COMMAND}) ****"
   for i in $(seq 1 $num_repeat_runs); do
     # Only reset NPU in CI to facilitate easier local testing without sudo access.
-    if [ "${GITHUB_ACTIONS}" = true ]; then
+    if [[ "$OSTYPE" == "linux-gnu"* ]] && [ "${GITHUB_ACTIONS}" = true ]; then
       echo "Reset NPU"
       bash $THIS_DIR/reset_npu.sh
     fi