From 76f12f69acf809483c325fe488ebba622c310d7e Mon Sep 17 00:00:00 2001 From: Sebastian Zagrodzki Date: Mon, 9 Nov 2020 10:07:43 +0100 Subject: [PATCH] Refresh pacman in the appveyor build (#84) ...for updated Go package versions. Go 1.12 is gone from the MSYS2 repos. --- .appveyor/install.sh | 6 ++++-- .appveyor/upgrade_pacman.sh | 8 ++++++++ appveyor.yml | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 .appveyor/upgrade_pacman.sh diff --git a/.appveyor/install.sh b/.appveyor/install.sh index e6110c2..44e645c 100644 --- a/.appveyor/install.sh +++ b/.appveyor/install.sh @@ -6,9 +6,11 @@ export GOROOT=/mingw64/lib/go export GOPATH=/go export CGO_ENABLED=1 +set -x + pacman --noconfirm -S \ - mingw64/mingw-w64-x86_64-go \ - mingw64/mingw-w64-x86_64-libusb + mingw-w64-x86_64-go \ + mingw-w64-x86_64-libusb go version go get -t github.com/google/gousb/... diff --git a/.appveyor/upgrade_pacman.sh b/.appveyor/upgrade_pacman.sh new file mode 100755 index 0000000..f6bd879 --- /dev/null +++ b/.appveyor/upgrade_pacman.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +export PATH="/mingw64/bin:${PATH}" +set -x +curl -O https://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz +curl -O https://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig +pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig &&\ +pacman --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz +pacman --noconfirm -Syy pacman diff --git a/appveyor.yml b/appveyor.yml index d19827f..d327a7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,7 @@ platform: x64 clone_folder: C:\msys64\go\src\github.com\google\gousb install: - - C:\msys64\usr\bin\bash.exe -lc "cd /go/src/github.com/google/gousb/ && .appveyor/./install.sh" + - C:\msys64\usr\bin\bash.exe -l /go/src/github.com/google/gousb/.appveyor/upgrade_pacman.sh + - C:\msys64\usr\bin\bash.exe -lc "cd /go/src/github.com/google/gousb/ && .appveyor/install.sh" build: off