From 2721656d4672004f1de4170b360d03e9d0d7262a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 14:58:48 +0200
Subject: [PATCH 01/11] appveyor.yml: don't install Go and MinGW, they're
 already there

---
 appveyor.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 89d3dfe3d7..e6b50d82b0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,16 +7,15 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-
-# cache choco package files so we don't hit sourceforge all
-# the time.
-cache:
-  - c:\cache
+    # MinGW and Go are preinstalled. Go is already in PATH.
+    PATH: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin:%PATH%
 
 install:
-  - cmd: choco install --cache c:\cache golang mingw | find /v "Extracting  "
-  - refreshenv
   - cd c:\gopath\src\github.com\ethereum\go-ethereum
+  - dir c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin
+  - echo %PATH%
+  - go version
+  - gcc --version
 
 build_script:
   - go run build\ci.go install

From 3705d661f693f971723c0f74e0ec6a16ba4e3c35 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 16:48:25 +0200
Subject: [PATCH 02/11] appveyor.yml: try clang

---
 appveyor.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e6b50d82b0..206b90d3fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,15 +7,12 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-    # MinGW and Go are preinstalled. Go is already in PATH.
-    PATH: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin:%PATH%
+    CC: clang
 
 install:
   - cd c:\gopath\src\github.com\ethereum\go-ethereum
-  - dir c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin
-  - echo %PATH%
   - go version
-  - gcc --version
+  - clang --version
 
 build_script:
   - go run build\ci.go install

From ff03c8fe4b3e892afc3df179ac1f1e9d065a8d3f Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 17:00:28 +0200
Subject: [PATCH 03/11] appveyor.yml: use absolute path for gcc

---
 appveyor.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 206b90d3fb..982e617a0b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,12 +7,11 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-    CC: clang
+    CC: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin\gcc.exe
 
 install:
-  - cd c:\gopath\src\github.com\ethereum\go-ethereum
   - go version
-  - clang --version
+  - "%CC% --version"
 
 build_script:
   - go run build\ci.go install

From cf68e45c958f3ccbf45676261394dd5a0f026d99 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 17:25:15 +0200
Subject: [PATCH 04/11] appveyor.yml: try MSYS2

---
 appveyor.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 982e617a0b..390476cc36 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,17 +7,18 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-    CC: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin\gcc.exe
 
 install:
   - go version
-  - "%CC% --version"
+  - cd c:\gopath\src\github.com\ethereum\go-ethereum
+  - set MSYSTEM=MINGW64
+  - C:\msys64\usr\bin\bash -l -c "gcc --version"
 
 build_script:
-  - go run build\ci.go install
+  - C:\msys64\usr\bin\bash -l -c "go run build/ci.go install"
 
 test_script:
-  - go run build\ci.go test -vet -coverage
+  - C:\msys64\usr\bin\bash -l -c "go run build/ci.go test -vet -coverage"
 
 after_build:
   - go run build\ci.go archive -type zip

From 47d73df19e85788e97d93e47ee1bca81d8458588 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 18:21:12 +0200
Subject: [PATCH 05/11] appveyor.yml: try mingw-w64 gcc again, pass -x

---
 appveyor.yml | 9 ++++-----
 build/ci.go  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 390476cc36..982e617a0b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,18 +7,17 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
+    CC: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin\gcc.exe
 
 install:
   - go version
-  - cd c:\gopath\src\github.com\ethereum\go-ethereum
-  - set MSYSTEM=MINGW64
-  - C:\msys64\usr\bin\bash -l -c "gcc --version"
+  - "%CC% --version"
 
 build_script:
-  - C:\msys64\usr\bin\bash -l -c "go run build/ci.go install"
+  - go run build\ci.go install
 
 test_script:
-  - C:\msys64\usr\bin\bash -l -c "go run build/ci.go test -vet -coverage"
+  - go run build\ci.go test -vet -coverage
 
 after_build:
   - go run build\ci.go archive -type zip
diff --git a/build/ci.go b/build/ci.go
index 33d97c1821..9c4ac9193f 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -148,7 +148,7 @@ func doInstall(cmdline []string) {
 	}
 
 	goinstall := goTool("install", makeBuildFlags(*commitHash)...)
-	goinstall.Args = append(goinstall.Args, "-v")
+	goinstall.Args = append(goinstall.Args, "-v", "-x")
 	goinstall.Args = append(goinstall.Args, packages...)
 	build.MustRun(goinstall)
 }

From bb8db6302fe1f627d104bf6342213e510025ca1e Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 19:20:57 +0200
Subject: [PATCH 06/11] appveyor.yml: try 32bit

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 982e617a0b..803776151a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,11 +7,11 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-    CC: c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin\gcc.exe
+    PATH: c:\go16-x86;c:\mingw\bin;%PATH%
 
 install:
   - go version
-  - "%CC% --version"
+  - gcc --version
 
 build_script:
   - go run build\ci.go install

From 85de9e5d41277f21cdf8bb4c4a3c2c0dd9248705 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 19:49:26 +0200
Subject: [PATCH 07/11] appveyor.yml: use 32bit

---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 803776151a..6248717940 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,20 +7,20 @@ version: "{branch}.{build}"
 environment:
   global:
     GOPATH: c:\gopath
-    PATH: c:\go16-x86;c:\mingw\bin;%PATH%
+    PATH: c:\mingw\bin;%PATH%
 
 install:
-  - go version
+  - c:\go-x86\go version
   - gcc --version
 
 build_script:
-  - go run build\ci.go install
+  - c:\go-x86\go run build\ci.go install
 
 test_script:
-  - go run build\ci.go test -vet -coverage
+  - c:\go-x86\go run build\ci.go test -vet -coverage
 
 after_build:
-  - go run build\ci.go archive -type zip
+  - c:\go-x86\go run build\ci.go archive -type zip
 
 artifacts:
   - path: geth-*.zip

From 74733f049a8830305c5dbe29fc168da652c8f557 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 19:49:56 +0200
Subject: [PATCH 08/11] build/ci.go: disable -x

---
 build/ci.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/ci.go b/build/ci.go
index 9c4ac9193f..33d97c1821 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -148,7 +148,7 @@ func doInstall(cmdline []string) {
 	}
 
 	goinstall := goTool("install", makeBuildFlags(*commitHash)...)
-	goinstall.Args = append(goinstall.Args, "-v", "-x")
+	goinstall.Args = append(goinstall.Args, "-v")
 	goinstall.Args = append(goinstall.Args, packages...)
 	build.MustRun(goinstall)
 }

From ab73c3fd24deed70dbadc4129b9ece79046d47fc Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 19:56:50 +0200
Subject: [PATCH 09/11] appveyor.yml: one more fix

---
 appveyor.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6248717940..54840a39c7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,19 +8,21 @@ environment:
   global:
     GOPATH: c:\gopath
     PATH: c:\mingw\bin;%PATH%
+    GO: c:\go-x86\bin\go
+    GOROOT: c:\go-x86
 
 install:
-  - c:\go-x86\go version
+  - "%GO% version"
   - gcc --version
 
 build_script:
-  - c:\go-x86\go run build\ci.go install
+  - "%GO% run build\\ci.go install"
 
 test_script:
-  - c:\go-x86\go run build\ci.go test -vet -coverage
+  - "%GO% run build\\ci.go test -vet -coverage"
 
 after_build:
-  - c:\go-x86\go run build\ci.go archive -type zip
+  - "%GO% run build\\ci.go archive -type zip"
 
 artifacts:
   - path: geth-*.zip

From e2ca3f9a3c89e73c988f8de068e416eeaa6059c1 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 22:13:56 +0200
Subject: [PATCH 10/11] appveyor.yml: try MSYS2

---
 appveyor.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 54840a39c7..b8e92085d6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,13 +6,21 @@ clone_depth: 5
 version: "{branch}.{build}"
 environment:
   global:
+    # Go stuff
     GOPATH: c:\gopath
-    PATH: c:\mingw\bin;%PATH%
-    GO: c:\go-x86\bin\go
-    GOROOT: c:\go-x86
+    GO: c:\go\bin\go
+    GOROOT: c:\go
+    # MSYS2 stuff
+    MSYS2_ARCH: x86_64
+    MSYSTEM: MINGW64
+    PATH: C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
 
 install:
   - "%GO% version"
+  # Update MSYS2, install MinGW gcc
+  - bash -lc "pacman --noconfirm --sync --refresh --refresh pacman"
+  - bash -lc "pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade"
+  - bash -lc "pacman --noconfirm -S --needed base-devel"
   - gcc --version
 
 build_script:

From f3ba5d85ca2992db617458747b62d2cdb0cc4e9f Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 13 Jul 2016 22:23:45 +0200
Subject: [PATCH 11/11] appveyor.yml: more MSYS2

---
 appveyor.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b8e92085d6..044ba3e8e6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,10 +17,11 @@ environment:
 
 install:
   - "%GO% version"
-  # Update MSYS2, install MinGW gcc
-  - bash -lc "pacman --noconfirm --sync --refresh --refresh pacman"
-  - bash -lc "pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade"
-  - bash -lc "pacman --noconfirm -S --needed base-devel"
+  # Update MSYS2
+  # - bash -lc "pacman --noconfirm --sync --refresh --refresh pacman"
+  # - bash -lc "pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade"
+  # Install MinGW gcc
+  - bash -lc "pacman --noconfirm -S mingw-w64-gcc"
   - gcc --version
 
 build_script: