From f4ae4ccd09c1b4d00b3212c39e0cfbe71ce2e53d Mon Sep 17 00:00:00 2001
From: Brian <bclark8923@gmail.com>
Date: Thu, 29 Aug 2024 19:40:29 -0400
Subject: [PATCH] Fix broken variables in NativeLink Cloud CI jobs and disable
 RBE test (#1293)

---
 .github/workflows/main.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 850a55477..37ccb0817 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-22.04
     environment: production
     name: NativeLink.com Cloud / RBE on Main (Legacy Dockerfile Test)
-    if: github.ref == 'refs/heads/main'
+    if: false
+    # github.ref == 'refs/heads/main'
     steps:
     - name: Checkout
       uses: >- # v4.1.1
@@ -35,7 +36,7 @@ jobs:
 
     - name: Calculate Dockerfile hash and Retrieve Image URI for RBE
       run: |
-        DOCKERFILE_HASH=$(sha256sum "${GITHUB_WORKSPACE}/tools/toolchain-nativelink/Dockerfile" | awk '{print $1}')
+        DOCKERFILE_HASH=$(sha256sum "$GITHUB_WORKSPACE/tools/toolchain-nativelink/Dockerfile" | awk '{print $1}')
         IMAGE_DETAILS=$(aws ecr describe-images --repository-name ${{ secrets.RBE_ECR_REPOSITORY_NAME }} --image-ids imageTag=$DOCKERFILE_HASH)
         if [ $? -ne 0 ]; then
           exit 1;
@@ -60,7 +61,7 @@ jobs:
           --bes_results_url=https://app.nativelink.com/a/e3b1e0e0-4b73-45d6-85bc-5cb7b02edea5/build \
           --remote_header=x-nativelink-project=nativelink-ci \
           --remote_executor=grpcs://scheduler-tracemachina-shared.build-faster.nativelink.net:443 \
-          --remote_default_exec_properties="container-image=docker://${RBE_IMAGE}" \
+          --remote_default_exec_properties="container-image=docker://$RBE_IMAGE" \
           --jobs=200 \
           //...
 
@@ -86,10 +87,10 @@ jobs:
       run: |
         bazel test \
           --remote_cache=grpcs://cas-tracemachina-shared.build-faster.nativelink.net \
-          --remote_header=x-nativelink-api-key=${NL_COM_API_KEY} \
+          --remote_header=x-nativelink-api-key=$NL_COM_API_KEY \
           --remote_instance_name=main \
           --bes_backend=grpcs://bes-tracemachina-shared.build-faster.nativelink.net \
-          --bes_header=x-nativelink-api-key=${NL_COM_API_KEY} \
+          --bes_header=x-nativelink-api-key=$NL_COM_API_KEY \
           --bes_results_url=https://app.nativelink.com/a/e3b1e0e0-4b73-45d6-85bc-5cb7b02edea5/build \
           --remote_header=x-nativelink-project=nativelink-ci \
           --jobs=200 \