From 8ef9846a4c5467972809dd2136003dd85e74069e Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Sun, 4 Aug 2019 19:49:14 +0100
Subject: [PATCH] build: CRLF again

---
 .gitattributes      |  1 +
 azure-pipelines.yml | 56 ++++++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 57d32f581..35157cfda 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@
 
 # Don't fiddle with the line endings of test data
 **/testdata/** -text
+**/test/** -text
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4d87c2575..62cbc4ceb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,21 +9,6 @@ trigger:
 
 strategy:
   matrix:
-    go1.9:
-      imageName: ubuntu-16.04
-      gorootDir: /usr/local
-      GO_VERSION: go1.9.7
-      MAKE_QUICKTEST: true
-    go1.10:
-      imageName: ubuntu-16.04
-      gorootDir: /usr/local
-      GO_VERSION: go1.10.8
-      MAKE_QUICKTEST: true
-    go1.11:
-      imageName: ubuntu-16.04
-      gorootDir: /usr/local
-      GO_VERSION: go1.11.8
-      MAKE_QUICKTEST: true
     linux:
       imageName: ubuntu-16.04
       gorootDir: /usr/local
@@ -33,6 +18,22 @@ strategy:
       MAKE_CHECK: true
       MAKE_QUICKTEST: true
       DEPLOY: true
+    mac:
+      imageName: macos-10.13
+      gorootDir: /usr/local
+      GO_VERSION: latest
+      GOTAGS: ""  # cmount doesn't work on osx travis for some reason
+      BUILD_FLAGS: '-include "^darwin/" -cgo'
+      MAKE_QUICKTEST: true
+      RACEMAKE_QUICKTEST: true
+      DEPLOY: true
+    windows:
+      imageName: windows-2019
+      gorootDir: C:\
+      GO_VERSION: latest
+      BUILD_FLAGS: '-include "^windows/amd64" -cgo' # 386 doesn't build yet
+      MAKE_QUICKTEST: true
+      DEPLOY: true
     other_os:
       imageName: ubuntu-16.04
       gorootDir: /usr/local
@@ -48,22 +49,21 @@ strategy:
       GOPROXY: https://proxy.golang.org
       MAKE_QUICKTEST: true
       RACEMAKE_QUICKTEST: true
-    mac:
-      imageName: macos-10.13
+    go1.9:
+      imageName: ubuntu-16.04
       gorootDir: /usr/local
-      GO_VERSION: latest
-      GOTAGS: ""  # cmount doesn't work on osx travis for some reason
-      BUILD_FLAGS: '-include "^darwin/" -cgo'
+      GO_VERSION: go1.9.7
       MAKE_QUICKTEST: true
-      RACEMAKE_QUICKTEST: true
-      DEPLOY: true
-    windows:
-      imageName: windows-2019
-      gorootDir: C:\
-      GO_VERSION: latest
-      BUILD_FLAGS: '-include "^windows/amd64" -cgo' # 386 doesn't build yet
+    go1.10:
+      imageName: ubuntu-16.04
+      gorootDir: /usr/local
+      GO_VERSION: go1.10.8
+      MAKE_QUICKTEST: true
+    go1.11:
+      imageName: ubuntu-16.04
+      gorootDir: /usr/local
+      GO_VERSION: go1.11.8
       MAKE_QUICKTEST: true
-      DEPLOY: true
 
 pool:
   vmImage: $(imageName)