Skip to content

Commit d4ee896

Browse files
committed
build: rm ubuntu from appveyor, skip spec tests on windows
1 parent 1e4b39e commit d4ee896

File tree

2 files changed

+14
-31
lines changed

2 files changed

+14
-31
lines changed

appveyor.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ clone_depth: 5
22
version: "{branch}.{build}"
33

44
image:
5-
- Ubuntu
65
- Visual Studio 2019
76

87
environment:
@@ -17,25 +16,6 @@ install:
1716
- go version
1817

1918
for:
20-
# Linux has its own script without -arch and -cc.
21-
# The linux builder also runs lint.
22-
- matrix:
23-
only:
24-
- image: Ubuntu
25-
build_script:
26-
- go run build/ci.go lint
27-
- go run build/ci.go check_generate
28-
- go run build/ci.go check_baddeps
29-
- go run build/ci.go install -dlgo
30-
test_script:
31-
- go run build/ci.go test -dlgo -short
32-
33-
# linux/386 is disabled.
34-
- matrix:
35-
exclude:
36-
- image: Ubuntu
37-
GETH_ARCH: 386
38-
3919
# Windows builds for amd64 + 386.
4020
- matrix:
4121
only:
@@ -56,4 +36,4 @@ for:
5636
- go run build/ci.go archive -arch %GETH_ARCH% -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
5737
- go run build/ci.go nsis -arch %GETH_ARCH% -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
5838
test_script:
59-
- go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC% -short
39+
- go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC% -short -skip-spectests

build/ci.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,23 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
281281

282282
func doTest(cmdline []string) {
283283
var (
284-
dlgo = flag.Bool("dlgo", false, "Download Go and build with it")
285-
arch = flag.String("arch", "", "Run tests for given architecture")
286-
cc = flag.String("cc", "", "Sets C compiler binary")
287-
coverage = flag.Bool("coverage", false, "Whether to record code coverage")
288-
verbose = flag.Bool("v", false, "Whether to log verbosely")
289-
race = flag.Bool("race", false, "Execute the race detector")
290-
short = flag.Bool("short", false, "Pass the 'short'-flag to go test")
291-
cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
284+
dlgo = flag.Bool("dlgo", false, "Download Go and build with it")
285+
arch = flag.String("arch", "", "Run tests for given architecture")
286+
cc = flag.String("cc", "", "Sets C compiler binary")
287+
coverage = flag.Bool("coverage", false, "Whether to record code coverage")
288+
verbose = flag.Bool("v", false, "Whether to log verbosely")
289+
race = flag.Bool("race", false, "Execute the race detector")
290+
short = flag.Bool("short", false, "Pass the 'short'-flag to go test")
291+
cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
292+
skipspectests = flag.Bool("skip-spectests", false, "Skip downloading execution-spec-tests fixtures")
292293
)
293294
flag.CommandLine.Parse(cmdline)
294295

295296
// Get test fixtures.
296-
csdb := download.MustLoadChecksums("build/checksums.txt")
297-
downloadSpecTestFixtures(csdb, *cachedir)
297+
if !*skipspectests {
298+
csdb := download.MustLoadChecksums("build/checksums.txt")
299+
downloadSpecTestFixtures(csdb, *cachedir)
300+
}
298301

299302
// Configure the toolchain.
300303
tc := build.GoToolchain{GOARCH: *arch, CC: *cc}

0 commit comments

Comments
 (0)