bump sccache to v0.5.4

rapidsai · Jul 10, 2023 · dd8df17 · dd8df17
1 parent a7b7963
commit dd8df17
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 59 deletions.
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -38,22 +38,21 @@ test_aws_creds() {
 
     if ! sccache --show-stats 2>&1 | grep -qE 'Cache location \s+ s3'; then
 
-        # # Disabled until sccache v0.5.4 is released (see https://github.com/mozilla/sccache/issues/1799)
-        # export SCCACHE_S3_NO_CREDENTIALS="1";
-
-        # export AWS_ACCESS_KEY_ID=;
-        # export AWS_SESSION_TOKEN=;
-        # export AWS_SECRET_ACCESS_KEY=;
-        # export -n AWS_ACCESS_KEY_ID;
-        # export -n AWS_SESSION_TOKEN;
-        # export -n AWS_SECRET_ACCESS_KEY;
-        # unset AWS_ACCESS_KEY_ID;
-        # unset AWS_SESSION_TOKEN;
-        # unset AWS_SECRET_ACCESS_KEY;
-
-        # if sccache --show-stats 2>&1 | grep -qE 'Cache location \s+ s3'; then
-        #     exit 2;
-        # fi
+        export SCCACHE_S3_NO_CREDENTIALS="1";
+
+        export AWS_ACCESS_KEY_ID=;
+        export AWS_SESSION_TOKEN=;
+        export AWS_SECRET_ACCESS_KEY=;
+        export -n AWS_ACCESS_KEY_ID;
+        export -n AWS_SESSION_TOKEN;
+        export -n AWS_SECRET_ACCESS_KEY;
+        unset AWS_ACCESS_KEY_ID;
+        unset AWS_SESSION_TOKEN;
+        unset AWS_SECRET_ACCESS_KEY;
+
+        if sccache --show-stats 2>&1 | grep -qE 'Cache location \s+ s3'; then
+            exit 2;
+        fi
 
         exit 1;
     fi

diff --git a/features/test/utils/scenarios.json b/features/test/utils/scenarios.json
@@ -28,7 +28,7 @@
       "cmake": {},
       "ninja": {},
       "sccache": {
-        "version": "0.5.3"
+        "version": "0.5.4"
       },
       "utils": {}
     },
@@ -73,7 +73,7 @@
       "cmake": {},
       "ninja": {},
       "sccache": {
-        "version": "0.5.3"
+        "version": "0.5.4"
       },
       "utils": {}
     },
@@ -118,7 +118,7 @@
       "cmake": {},
       "ninja": {},
       "sccache": {
-        "version": "0.5.3"
+        "version": "0.5.4"
       },
       "utils": {}
     },

diff --git a/features/test/utils/ubuntu18.04.sh b/features/test/utils/ubuntu18.04.sh
@@ -124,19 +124,18 @@ if test -n "${rw_sccache_bucket:-}"; then
     check "bad creds with SCCACHE_BUCKET and no VAULT_HOST uses local disk cache" bad_creds_with_sccache_bucket_and_no_vault_host_uses_local_disk_cache;
 fi
 
-# Disabled until sccache v0.5.4 is released (see https://github.com/mozilla/sccache/issues/1799)
-# if test -n "${ro_sccache_bucket:-}"; then
-
-#     readonly_sccache_bucket_uses_s3_cache() {
-#         reset_state;
-#         SCCACHE_BUCKET="${ro_sccache_bucket}" \
-#         SCCACHE_REGION="${ro_sccache_region}" \
-#         devcontainer-utils-post-attach-command;
-#         expect_s3_cache_is_used;
-#     }
-
-#     check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
-# fi
+if test -n "${ro_sccache_bucket:-}"; then
+
+    readonly_sccache_bucket_uses_s3_cache() {
+        reset_state;
+        SCCACHE_BUCKET="${ro_sccache_bucket}" \
+        SCCACHE_REGION="${ro_sccache_region}" \
+        devcontainer-utils-post-attach-command;
+        expect_s3_cache_is_used;
+    }
+
+    check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
+fi
 
 if test -n "${gh_token:-}" \
 && test -n "${vault_host:-}" \

diff --git a/features/test/utils/ubuntu20.04.sh b/features/test/utils/ubuntu20.04.sh
@@ -124,19 +124,18 @@ if test -n "${rw_sccache_bucket:-}"; then
     check "bad creds with SCCACHE_BUCKET and no VAULT_HOST uses local disk cache" bad_creds_with_sccache_bucket_and_no_vault_host_uses_local_disk_cache;
 fi
 
-# Disabled until sccache v0.5.4 is released (see https://github.com/mozilla/sccache/issues/1799)
-# if test -n "${ro_sccache_bucket:-}"; then
-
-#     readonly_sccache_bucket_uses_s3_cache() {
-#         reset_state;
-#         SCCACHE_BUCKET="${ro_sccache_bucket}" \
-#         SCCACHE_REGION="${ro_sccache_region}" \
-#         devcontainer-utils-post-attach-command;
-#         expect_s3_cache_is_used;
-#     }
-
-#     check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
-# fi
+if test -n "${ro_sccache_bucket:-}"; then
+
+    readonly_sccache_bucket_uses_s3_cache() {
+        reset_state;
+        SCCACHE_BUCKET="${ro_sccache_bucket}" \
+        SCCACHE_REGION="${ro_sccache_region}" \
+        devcontainer-utils-post-attach-command;
+        expect_s3_cache_is_used;
+    }
+
+    check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
+fi
 
 if test -n "${gh_token:-}" \
 && test -n "${vault_host:-}" \

diff --git a/features/test/utils/ubuntu22.04.sh b/features/test/utils/ubuntu22.04.sh
@@ -124,19 +124,18 @@ if test -n "${rw_sccache_bucket:-}"; then
     check "bad creds with SCCACHE_BUCKET and no VAULT_HOST uses local disk cache" bad_creds_with_sccache_bucket_and_no_vault_host_uses_local_disk_cache;
 fi
 
-# Disabled until sccache v0.5.4 is released (see https://github.com/mozilla/sccache/issues/1799)
-# if test -n "${ro_sccache_bucket:-}"; then
-
-#     readonly_sccache_bucket_uses_s3_cache() {
-#         reset_state;
-#         SCCACHE_BUCKET="${ro_sccache_bucket}" \
-#         SCCACHE_REGION="${ro_sccache_region}" \
-#         devcontainer-utils-post-attach-command;
-#         expect_s3_cache_is_used;
-#     }
-
-#     check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
-# fi
+if test -n "${ro_sccache_bucket:-}"; then
+
+    readonly_sccache_bucket_uses_s3_cache() {
+        reset_state;
+        SCCACHE_BUCKET="${ro_sccache_bucket}" \
+        SCCACHE_REGION="${ro_sccache_region}" \
+        devcontainer-utils-post-attach-command;
+        expect_s3_cache_is_used;
+    }
+
+    check "Readonly SCCACHE_BUCKET uses S3 cache" readonly_sccache_bucket_uses_s3_cache;
+fi
 
 if test -n "${gh_token:-}" \
 && test -n "${vault_host:-}" \

diff --git a/image/.devcontainer/devcontainer.json b/image/.devcontainer/devcontainer.json
@@ -26,7 +26,7 @@
     "./features/cmake": {},
     "./features/ninja": {},
     "./features/sccache": {
-      "version": "0.5.3"
+      "version": "0.5.4"
     },
     "./features/utils": {}
   },