From 7499d4ee8ac4c263a0c6b5605116bc02da837cee Mon Sep 17 00:00:00 2001
From: Siyuan Liu <lsiyuan@google.com>
Date: Wed, 11 Oct 2023 03:42:53 +0000
Subject: [PATCH] clean up for landing

---
 .circleci/docker/Dockerfile          | 1 -
 .github/workflows/_build.yml         | 5 ++---
 .github/workflows/build_and_test.yml | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
index e3e1b779ea3..f0cd196511c 100644
--- a/.circleci/docker/Dockerfile
+++ b/.circleci/docker/Dockerfile
@@ -94,5 +94,4 @@ ENV PATH /opt/conda/bin:$PATH
 ENV LD_LIBRARY_PATH /lib/x86_64-linux-gnu/:/usr/lib/x86_64-linux-gnu/:/opt/conda/lib/:$LD_LIBRARY_PATH
 
 RUN bash -c "source ~/.bashrc"
-
 CMD ["bash"]
diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
index caec443b755..879594476ef 100644
--- a/.github/workflows/_build.yml
+++ b/.github/workflows/_build.yml
@@ -73,8 +73,8 @@ jobs:
             # if image layers are not present in the repo.
             # Note: disable the following 2 lines while testing a new image, so we do not
             # push to the upstream.
-            docker tag "${GCR_DOCKER_IMAGE}" "${ECR_DOCKER_IMAGE_BASE}:v1.1.3-lite-test" >/dev/null
-            docker push "${ECR_DOCKER_IMAGE_BASE}:v1.1.3-lite-test" >/dev/null
+            docker tag "${GCR_DOCKER_IMAGE}" "${ECR_DOCKER_IMAGE_BASE}:v1.1-lite" >/dev/null
+            docker push "${ECR_DOCKER_IMAGE_BASE}:v1.1-lite" >/dev/null
       - name: Start the container
         shell: bash
         run: |
@@ -87,7 +87,6 @@ jobs:
         shell: bash
         run: |
           echo "declare -x SCCACHE_BUCKET=${SCCACHE_BUCKET}" | docker exec -i "${pid}" sh -c "cat >> env"
-          echo "declare -x USE_CUDA=0" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x DISABLE_XRT=${DISABLE_XRT}" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x XLA_CUDA=${XLA_CUDA}" | docker exec -i "${pid}" sh -c "cat >> xla_env"
           echo "declare -x BAZEL_REMOTE_CACHE=1" | docker exec -i "${pid}" sh -c "cat >> xla_env"
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index d82b7a15cbc..31b415c503e 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -49,7 +49,7 @@ jobs:
 
   test-cpu-coverage:
     name: "Collect CPU test coverage"
-    # if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
     uses: ./.github/workflows/_coverage.yml
     needs: build
     with:
@@ -62,7 +62,7 @@ jobs:
 
   test-gpu-coverage:
     name: "Collect GPU test coverage"
-    # if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
     uses: ./.github/workflows/_coverage.yml
     needs: build
     with:
@@ -76,7 +76,7 @@ jobs:
 
   push-docs:
     name: "Build & publish docs"
-    # if: github.event_name == 'push' && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/tags/r'))
+    if: github.event_name == 'push' && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/tags/r'))
     uses: ./.github/workflows/_docs.yml
     needs: build
     with: