From be26146e2800e68ccec15355b6b49042de4d1fa2 Mon Sep 17 00:00:00 2001
From: AJ Schmidt <aschmidt@nvidia.com>
Date: Sat, 11 Feb 2023 18:58:58 -0500
Subject: [PATCH 1/3] Update `sccache` bucket

This PR updates the `sccache` configuration settings to use a new bucket, `rapids-sccache-east`.

Unlike the previous `rapids-sccache` bucket, `rapids-sccache-east` resides in the same AWS region as the rest of our CI infrastructure (`us-east-2`).

This should result in faster, more reliable `sccache` connections and will also help keep our data transfer costs down.

**Important Note**: The changes from [this `sccache` PR](https://github.com/mozilla/sccache/pull/1403) are required to use a bucket in `us-east-2`. These changes were incorporated in `sccache` `v0.3.2`, so you'll need that version or later (preferably the latest, `v0.3.3`). Please ensure that your CI images satisfy this constraint before merging this PR.

Additionally, this PR updates the `SCCACHE_REGION` to the region of the bucket. This value is not meant to be a variable.
---
 .github/workflows/ci_pipe.yml | 4 ----
 ci/scripts/github/common.sh   | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
index 9b8c55e5e..08ff218cf 100644
--- a/.github/workflows/ci_pipe.yml
+++ b/.github/workflows/ci_pipe.yml
@@ -19,9 +19,6 @@ run-name: CI Pipeline
 on:
   workflow_call:
     inputs:
-      aws_region:
-        default: 'us-west-2'
-        type: string
       run_check:
         required: true
         type: boolean
@@ -47,7 +44,6 @@ on:
         required: true
 
 env:
-  AWS_DEFAULT_REGION: ${{ inputs.aws_region }}
   AWS_ACCESS_KEY_ID: "${{ secrets.GHA_AWS_ACCESS_KEY_ID }}"
   AWS_SECRET_ACCESS_KEY: "${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}"
   CHANGE_TARGET: "${{ github.base_ref }}"
diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh
index ccd36ab71..8765d51e6 100644
--- a/ci/scripts/github/common.sh
+++ b/ci/scripts/github/common.sh
@@ -59,8 +59,8 @@ export DISPLAY_ARTIFACT_URL="${DISPLAY_URL}${ARTIFACT_ENDPOINT}"
 
 # Set sccache env vars
 export SCCACHE_S3_KEY_PREFIX=mrc-${NVARCH}-${BUILD_CC}
-export SCCACHE_BUCKET=rapids-sccache
-export SCCACHE_REGION="${AWS_DEFAULT_REGION}"
+export SCCACHE_BUCKET=rapids-sccache-east
+export SCCACHE_REGION="us-east-2"
 export SCCACHE_IDLE_TIMEOUT=32768
 #export SCCACHE_LOG=debug
 

From 56ccb9de641dd15887db78bbffc4655a949256f4 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Mon, 13 Feb 2023 10:06:28 -0800
Subject: [PATCH 2/3] Adopt updated CI runner with sccache 0.3.3

---
 .github/workflows/pull_request.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1178a10d1..9b456e4ef 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -33,8 +33,8 @@ jobs:
     with:
       run_check: ${{ startsWith(github.ref_name, 'pull-request/') }}
       run_package_conda: ${{ !startsWith(github.ref_name, 'pull-request/') }}
-      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-driver-230131
-      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230131
+      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-driver-230213
+      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230213
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}

From 6eb47287c6503dbe9bfae331d5322b752fce7745 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Mon, 13 Feb 2023 10:56:53 -0800
Subject: [PATCH 3/3] Log sccache version

---
 ci/scripts/github/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/scripts/github/build.sh b/ci/scripts/github/build.sh
index 7e6db5e6a..c1eae4d58 100755
--- a/ci/scripts/github/build.sh
+++ b/ci/scripts/github/build.sh
@@ -26,6 +26,7 @@ rapids-logger "Check versions"
 python3 --version
 cmake --version
 ninja --version
+sccache --version
 
 if [[ "${BUILD_CC}" == "gcc" ]]; then
     rapids-logger "Building with GCC"