From 706ff24d3374cd38fcb5e624f246bd6efab54a1b Mon Sep 17 00:00:00 2001
From: Tian Jin <tjingrant@gmail.com>
Date: Tue, 31 Dec 2019 13:28:26 -0500
Subject: [PATCH] 1. Remove quotes from strings in yaml file for better
 consistency. 2. Use MAKEFLAGS env variable to limit build parallelism so that
 mlir installation script remains clean.

---
 .circleci/config.yml      | 11 ++++++-----
 .circleci/install-mlir.sh |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a49db93..0d25c27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,25 +7,26 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: Pull Submodules
           command: |
             git submodule update --init --recursive
       - run:
           name: Installing GCC, CMake, Ninja, Protobuf
-          command: 'sudo apt-get update && sudo apt-get install -y gcc g++ cmake ninja-build protobuf-compiler'
+          command: sudo apt-get update && sudo apt-get install -y gcc g++ cmake ninja-build protobuf-compiler
       # Use cached mlir installation if possible.
       - restore_cache:
-          key: V1-LLVM-PROJECT-{{ arch }}
+          key: V2-LLVM-PROJECT-{{ arch }}
       - run:
           name: Install MLIR
           command: |
             # Check whether cache restoration succeeds by checking whether
             # mlir-opt executable exists.
             if [ ! -f llvm-project/build/bin/mlir-opt ]; then
-              sh .circleci/install-mlir.sh
+              export MAKEFLAGS=-j4
+              source .circleci/install-mlir.sh
             fi
       - save_cache:
-          key: V1-LLVM-PROJECT-{{ arch }}
+          key: V2-LLVM-PROJECT-{{ arch }}
           paths:
             - llvm-project
       - run:
diff --git a/.circleci/install-mlir.sh b/.circleci/install-mlir.sh
index b442233..dfbb2cf 100644
--- a/.circleci/install-mlir.sh
+++ b/.circleci/install-mlir.sh
@@ -8,5 +8,5 @@ cmake -G Ninja ../llvm \
    -DCMAKE_BUILD_TYPE=Release \
    -DLLVM_ENABLE_ASSERTIONS=ON \
    -DLLVM_ENABLE_RTTI=ON
-# TODO(tjingrant): why is RTTI necessary?
-cmake --build . --target check-mlir -- -j ${PARALLEL_JOBS_LIMIT:-4}
\ No newline at end of file
+
+cmake --build . --target check-mlir
\ No newline at end of file