Skip to content

Commit 9a9c6da

Browse files
committed
update appveyor build
1 parent 2eca0d8 commit 9a9c6da

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

.appveyor.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version:
22
"{build}"
33

44
os:
5-
Windows Server 2012 R2
5+
Visual Studio 2019
66

77
clone_folder:
88
C:\grok_exporter
@@ -13,8 +13,6 @@ environment:
1313
CC: x86_64-w64-mingw32-gcc
1414
CGO_ENABLED: 1
1515
CGO_LDFLAGS: C:\msys64\mingw64\lib\libonig.a
16-
matrix:
17-
- ONIG_VERSION: 6.9.4
1816

1917
# --------------------------------------------------------------------------
2018
# The install phase installs the Oniguruma library,
@@ -28,20 +26,20 @@ install:
2826

2927
# Uncomment the following command to upgrade the cygwin packages:
3028
# - C:\cygwin\setup-x86.exe -q -g
31-
- C:\cygwin\bin\bash -lc "cygcheck -dc cygwin"
29+
- C:\cygwin64\bin\bash -lc "cygcheck -dc cygwin"
3230

3331
# Download and unpack Oniguruma sources
3432

3533
- cd C:\
36-
- appveyor DownloadFile https://github.com/kkos/oniguruma/releases/download/v%ONIG_VERSION%/onig-%ONIG_VERSION%.tar.gz
37-
- 7z x onig-%ONIG_VERSION%.tar.gz -so | 7z x -si -ttar > nul
38-
- cd onig-%ONIG_VERSION%
34+
- appveyor DownloadFile https://github.com/kkos/oniguruma/releases/download/v6.9.5_rev1/onig-6.9.5-rev1.tar.gz
35+
- 7z x onig-6.9.5-rev1.tar.gz -so | 7z x -si -ttar > nul
36+
- cd onig-6.9.5
3937

4038
# Compile Oniguruma using x86_64-w64-mingw32-gcc
4139

42-
- C:\cygwin\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./configure -v --host=x86_64-w64-mingw32 --prefix=/cygdrive/c/msys64/mingw64"
43-
- C:\cygwin\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' make"
44-
- C:\cygwin\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' make install"
40+
- C:\cygwin64\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./configure -v --host=x86_64-w64-mingw32 --prefix=/cygdrive/c/msys64/mingw64"
41+
- C:\cygwin64\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' make"
42+
- C:\cygwin64\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' make install"
4543

4644
# --------------------------------------------------------------------------
4745
# The build phase compiles and tests grok_exporter.
@@ -50,15 +48,14 @@ install:
5048
build_script:
5149
- cd c:\grok_exporter
5250
- git submodule update --init --recursive
53-
- set GO111MODULE=on
5451
- go version
5552
- go test ./...
5653
- go install
57-
- C:\cygwin\bin\bash -c "cd /cygdrive/c/grok_exporter ; PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./hack/smoke-test.sh"
54+
- C:\cygwin64\bin\bash -c "cd /cygdrive/c/grok_exporter ; PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./hack/smoke-test.sh"
5855

5956
# Print the linked DLLs, so we can check that grok_exporter does not have
6057
# a runtime dependency on Oniguruma.
61-
- C:\cygwin\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' x86_64-w64-mingw32-objdump -p /cygdrive/c/go/bin/grok_exporter.exe | grep 'DLL Name:'"
58+
- C:\cygwin64\bin\bash -c "PATH='/usr/sbin:/usr/bin:/sbin:/bin' x86_64-w64-mingw32-objdump -p /cygdrive/c/go/bin/grok_exporter.exe | grep 'DLL Name:'"
6259

6360
# Success.
6461
- grok_exporter -version

0 commit comments

Comments
 (0)