Skip to content

Commit 106a3b8

Browse files
author
Jeremy Rand
committed
Merge #76: CI: Remove "Modules Off" configs
1f42eea CI: Remove "Modules Off" configs (Jeremy Rand) Pull request description: Like it or not, Go modules are what everyone uses. Top commit has no ACKs. Tree-SHA512: a669e693d9f3325cf36c5dd5c4907ed5b37702203ca0b223318ee4c00f7adbd767d861faf0926e3d045423b659ff6f4b692cc0a7327a0f4edded40c81c29d803
2 parents ffc3c5a + 1f42eea commit 106a3b8

1 file changed

Lines changed: 24 additions & 45 deletions

File tree

.cirrus.yml

Lines changed: 24 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,19 @@ task:
7070
- apt-get install -y libcap-dev
7171
path_script:
7272
- source testdata/move_to_gopath.bash
73-
matrix:
74-
- env:
75-
GO111MODULE: "off"
76-
fetch_script:
77-
- go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
78-
- GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
79-
- go generate github.com/namecoin/x509-compressed/...
80-
- go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
81-
allow_failures: true
82-
- kingpin_script:
83-
- mkdir -p $(go env GOPATH)/src/github.com/alecthomas
84-
- cd $(go env GOPATH)/src/github.com/alecthomas
85-
- git clone https://github.com/alecthomas/kingpin.git
86-
fetch_script:
87-
- cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
88-
- go mod init
89-
- go mod edit -replace gopkg.in/alecthomas/kingpin.v2=$(go env GOPATH)/src/github.com/alecthomas/kingpin
90-
- go mod tidy
91-
# Get the test suite
92-
- mkdir -p $(go env GOPATH)/src/github.com/hlandau
93-
- cd $(go env GOPATH)/src/github.com/hlandau
94-
- git clone https://github.com/hlandau/nctestsuite.git
73+
kingpin_script:
74+
- mkdir -p $(go env GOPATH)/src/github.com/alecthomas
75+
- cd $(go env GOPATH)/src/github.com/alecthomas
76+
- git clone https://github.com/alecthomas/kingpin.git
77+
fetch_script:
78+
- cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
79+
- go mod init
80+
- go mod edit -replace gopkg.in/alecthomas/kingpin.v2=$(go env GOPATH)/src/github.com/alecthomas/kingpin
81+
- go mod tidy
82+
# Get the test suite
83+
- mkdir -p $(go env GOPATH)/src/github.com/hlandau
84+
- cd $(go env GOPATH)/src/github.com/hlandau
85+
- git clone https://github.com/hlandau/nctestsuite.git
9586
test_script:
9687
- cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
9788
- go install -tags "$GOX_TAGS" -v ./...
@@ -179,7 +170,6 @@ task:
179170
- "Cross-Compile Go $GO_VERSION"
180171
env:
181172
GO_VERSION: latest
182-
MODULES_NAME: ""
183173

184174
task:
185175
name: Cross-Compile Go $GO_VERSION
@@ -198,28 +188,17 @@ task:
198188
- apt-get install -y gcc-multilib libcap-dev libc6-dev:i386 libcap-dev:i386 libc6-dev:armhf libcap-dev:armhf libc6-dev:arm64 libcap-dev:arm64 libc6-dev:ppc64el libcap-dev:ppc64el
199189
path_script:
200190
- source testdata/move_to_gopath.bash
201-
matrix:
202-
- env:
203-
GO111MODULE: "off"
204-
gox_script:
205-
- go get github.com/mitchellh/gox
206-
fetch_script:
207-
- go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
208-
- GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
209-
- go generate github.com/namecoin/x509-compressed/...
210-
- go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
211-
allow_failures: true
212-
- gox_script:
213-
- go install github.com/mitchellh/gox@latest
214-
kingpin_script:
215-
- mkdir -p $(go env GOPATH)/src/github.com/alecthomas
216-
- cd $(go env GOPATH)/src/github.com/alecthomas
217-
- git clone https://github.com/alecthomas/kingpin.git
218-
fetch_script:
219-
- cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
220-
- go mod init
221-
- go mod edit -replace gopkg.in/alecthomas/kingpin.v2=$(go env GOPATH)/src/github.com/alecthomas/kingpin
222-
- go mod tidy
191+
gox_script:
192+
- go install github.com/mitchellh/gox@latest
193+
kingpin_script:
194+
- mkdir -p $(go env GOPATH)/src/github.com/alecthomas
195+
- cd $(go env GOPATH)/src/github.com/alecthomas
196+
- git clone https://github.com/alecthomas/kingpin.git
197+
fetch_script:
198+
- cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
199+
- go mod init
200+
- go mod edit -replace gopkg.in/alecthomas/kingpin.v2=$(go env GOPATH)/src/github.com/alecthomas/kingpin
201+
- go mod tidy
223202
matrix:
224203
- env:
225204
GOX_TAGS: ""

0 commit comments

Comments
 (0)