wip

pre-commit · Aug 29, 2021 · 27cacb1 · 27cacb1
1 parent 73168a6
commit 27cacb1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,9 +26,9 @@ jobs:
         Write-Host "##vso[task.prependpath]C:\Strawberry\perl\site\bin"
         Write-Host "##vso[task.prependpath]C:\Strawberry\c\bin"
       displayName: Add strawberry perl to PATH
-    - task: PowerShell@2
-      inputs:
-        filePath: "testing/get-r.ps1"
+    - bash: testing/get-dart.sh
+      displayName: install dart
+    - powershell: testing/get-r.ps1
       displayName: install R
 - template: job--python-tox.yml@asottile
   parameters:
@@ -38,13 +38,11 @@ jobs:
     pre_test:
     - task: UseRubyVersion@0
     - template: step--git-install.yml
-    - bash: |
-        testing/get-coursier.sh
-        echo '##vso[task.prependpath]/tmp/coursier'
+    - bash: testing/get-coursier.sh
       displayName: install coursier
-    - bash: |
-        testing/get-swift.sh
-        echo '##vso[task.prependpath]/tmp/swift/usr/bin'
+    - bash: testing/get-dart.sh
+      displayName: install dart
+    - bash: testing/get-swift.sh
       displayName: install swift
     - bash: testing/get-r.sh
       displayName: install R
@@ -54,13 +52,11 @@ jobs:
     os: linux
     pre_test:
     - task: UseRubyVersion@0
-    - bash: |
-        testing/get-coursier.sh
-        echo '##vso[task.prependpath]/tmp/coursier'
+    - bash: testing/get-coursier.sh
       displayName: install coursier
-    - bash: |
-        testing/get-swift.sh
-        echo '##vso[task.prependpath]/tmp/swift/usr/bin'
+    - bash: testing/get-dart.sh
+      displayName: install dart
+    - bash: testing/get-swift.sh
       displayName: install swift
     - bash: testing/get-r.sh
       displayName: install R
diff --git a/testing/get-coursier.sh b/testing/get-coursier.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # This is a script used in CI to install coursier
-set -euxo pipefail
+set -euo pipefail
 
 COURSIER_URL="https://github.com/coursier/coursier/releases/download/v2.0.0/cs-x86_64-pc-linux"
 COURSIER_HASH="e2e838b75bc71b16bcb77ce951ad65660c89bda7957c79a0628ec7146d35122f"
@@ -11,3 +11,5 @@ rm -f "$ARTIFACT"
 curl --location --silent --output "$ARTIFACT" "$COURSIER_URL"
 echo "$COURSIER_HASH  $ARTIFACT" | sha256sum --check
 chmod ugo+x /tmp/coursier/cs
+
+echo '##vso[task.prependpath]/tmp/coursier'
diff --git a/testing/get-dart.sh b/testing/get-dart.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+VERSION=2.13.4
+
+if [ "$OSTYPE" = msys ]; then
+    URL="https://storage.googleapis.com/dart-archive/channels/stable/release/${VERSION}/sdk/dartsdk-windows-x64-release.zip"
+    echo "##vso[task.prependpath]$(cygpath -w /tmp/dart-sdk/bin)"
+else
+    URL="https://storage.googleapis.com/dart-archive/channels/stable/release/${VERSION}/sdk/dartsdk-linux-x64-release.zip"
+    echo '##vso[task.prependpath]/tmp/dart-sdk/bin'
+fi
+
+curl --silent --location --output /tmp/dart.zip "$URL"
+
+unzip -q -d /tmp /tmp/dart.zip
+rm /tmp/dart.zip
diff --git a/testing/get-swift.sh b/testing/get-swift.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # This is a script used in CI to install swift
-set -euxo pipefail
+set -euo pipefail
 
 . /etc/lsb-release
 if [ "$DISTRIB_CODENAME" = "bionic" ]; then
@@ -25,3 +25,5 @@ fi
 
 mkdir -p /tmp/swift
 tar -xf "$TGZ" --strip 1 --directory /tmp/swift
+
+echo '##vso[task.prependpath]/tmp/swift/usr/bin'