Bug 1549346 - toggle sccache gcs feature to always on r=chmanchester
authorRob Thijssen <rthijssen@mozilla.com>
Mon, 13 May 2019 23:56:02 +0000
changeset 532569 b23f1b4655818d6d64517ddd7fa74fae1fbd9507
parent 532568 a928c7e7995bccca093bc5809ae53a007d9d04a3
child 532570 3840128adf0a6c129ef34650fdf4d5cc0a79db38
push id11270
push userrgurzau@mozilla.com
push dateWed, 15 May 2019 15:07:19 +0000
treeherdermozilla-beta@571bc76da583 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1549346
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549346 - toggle sccache gcs feature to always on r=chmanchester partial revert of https://hg.mozilla.org/mozilla-central/rev/5b08dd3eeec9 where the gcs feature switch should have been to the win build only and always enabled rather than just when the SCCACHE_GCS_KEY_PATH variable is set. Differential Revision: https://phabricator.services.mozilla.com/D30774
taskcluster/scripts/misc/build-sccache.sh
--- a/taskcluster/scripts/misc/build-sccache.sh
+++ b/taskcluster/scripts/misc/build-sccache.sh
@@ -61,28 +61,20 @@ EOF
     make -j `nproc --all`
     # `make install` installs a *ton* of docs that we don't care about.
     # Just the software, please.
     make install_sw
     popd
 
     # We don't need to set OPENSSL_STATIC here, because we only have static
     # libraries in the directory we are passing.
-    if [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
-        env "OPENSSL_DIR=$OPENSSL_BUILD_DIRECTORY" cargo build --features "all dist-server gcs" --verbose --release
-    else
-        env "OPENSSL_DIR=$OPENSSL_BUILD_DIRECTORY" cargo build --features "all dist-server" --verbose --release
-    fi
+    env "OPENSSL_DIR=$OPENSSL_BUILD_DIRECTORY" cargo build --features "all dist-server" --verbose --release
     ;;
 MINGW*)
-    if [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
-        cargo build --verbose --release --features=gcs
-    else
-        cargo build --verbose --release
-    fi
+    cargo build --verbose --release --features="dist-client s3 gcs"
     ;;
 esac
 
 mkdir sccache2
 cp target/release/sccache* sccache2/
 tar -acf sccache2.tar.$COMPRESS_EXT sccache2
 mkdir -p $UPLOAD_DIR
 cp sccache2.tar.$COMPRESS_EXT $UPLOAD_DIR