Explorar el Código

Merge topic 'sccache-macos-without-timeouts' into release-3.19

b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <[email protected]>
Acked-by: Kyle Edwards <[email protected]>
Merge-request: !5394
Brad King hace 5 años
padre
commit
d3d292aa7b
Se han modificado 1 ficheros con 12 adiciones y 4 borrados
  1. 12 4
      .gitlab/ci/sccache.sh

+ 12 - 4
.gitlab/ci/sccache.sh

@@ -2,17 +2,17 @@
 
 
 set -e
 set -e
 
 
-readonly version="0.2.13"
-
 case "$( uname -s )" in
 case "$( uname -s )" in
     Linux)
     Linux)
+        version="0.2.13"
         shatool="sha256sum"
         shatool="sha256sum"
         sha256sum="28a5499e340865b08b632306b435913beb590fbd7b49a3f887a623b459fabdeb"
         sha256sum="28a5499e340865b08b632306b435913beb590fbd7b49a3f887a623b459fabdeb"
         platform="x86_64-unknown-linux-musl"
         platform="x86_64-unknown-linux-musl"
         ;;
         ;;
     Darwin)
     Darwin)
+        version="gfe63078"
         shatool="shasum -a 256"
         shatool="shasum -a 256"
-        sha256sum="f564e948abadfc9e409eb1cd7babf24c6784057d5506c3b0a04cdd37cd830ae9"
+        sha256sum="60a0302b1d7227f7ef56abd82266353f570d27c6e850c56c6448bf62def38888"
         platform="x86_64-apple-darwin"
         platform="x86_64-apple-darwin"
         ;;
         ;;
     *)
     *)
@@ -20,6 +20,7 @@ case "$( uname -s )" in
         exit 1
         exit 1
         ;;
         ;;
 esac
 esac
+readonly version
 readonly shatool
 readonly shatool
 readonly sha256sum
 readonly sha256sum
 readonly platform
 readonly platform
@@ -27,10 +28,17 @@ readonly platform
 readonly filename="sccache-$version-$platform"
 readonly filename="sccache-$version-$platform"
 readonly tarball="$filename.tar.gz"
 readonly tarball="$filename.tar.gz"
 
 
+if [ "$( uname -s )" = "Darwin" ]; then
+    url="https://paraview.org/files/dependencies"
+else
+    url="https://github.com/mozilla/sccache/releases/download/$version"
+fi
+readonly url
+
 cd .gitlab
 cd .gitlab
 
 
 echo "$sha256sum  $tarball" > sccache.sha256sum
 echo "$sha256sum  $tarball" > sccache.sha256sum
-curl -OL "https://github.com/mozilla/sccache/releases/download/$version/$tarball"
+curl -OL "$url/$tarball"
 $shatool --check sccache.sha256sum
 $shatool --check sccache.sha256sum
 tar xf "$tarball"
 tar xf "$tarball"
 mv "$filename/sccache" .
 mv "$filename/sccache" .