Skip to content

Commit 2f95a5d

Browse files
aykevldeadprogram
authored andcommitted
ci: use go modules instead of dep
This also updates the LLVM build to include this commit: llvm-mirror/llvm@d519e42
1 parent eb1d834 commit 2f95a5d

File tree

1 file changed

+12
-33
lines changed

1 file changed

+12
-33
lines changed

.circleci/config.yml

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,16 @@ commands:
4040
sudo tar -C /usr/local -xf node-v10.15.1-linux-x64.tar.xz
4141
sudo ln -s /usr/local/node-v10.15.1-linux-x64/bin/node /usr/bin/node
4242
rm node-v10.15.1-linux-x64.tar.xz
43-
dep:
44-
steps:
45-
- run:
46-
name: "Install Go dependencies"
47-
command: |
48-
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
49-
dep ensure --vendor-only
5043
llvm-source-linux:
5144
steps:
5245
- restore_cache:
5346
keys:
54-
- llvm-source-8-v2
47+
- llvm-source-8-v3
5548
- run:
5649
name: "Fetch LLVM source"
5750
command: make llvm-source
5851
- save_cache:
59-
key: llvm-source-8-v2
52+
key: llvm-source-8-v3
6053
paths:
6154
- llvm
6255
smoketest:
@@ -66,21 +59,17 @@ commands:
6659
steps:
6760
- run: make smoketest-no-avr
6861
test-linux:
69-
parameters:
70-
llvm:
71-
type: string
7262
steps:
7363
- checkout
7464
- submodules
7565
- apt-dependencies:
76-
llvm: <<parameters.llvm>>
66+
llvm: "-8"
7767
- install-node
7868
- restore_cache:
7969
keys:
8070
- go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
8171
- go-cache-{{ checksum "Gopkg.lock" }}
8272
- llvm-source-linux
83-
- dep
8473
- run: go install .
8574
- run: go test -v
8675
- run: make gen-device -j4
@@ -117,7 +106,7 @@ commands:
117106
- llvm-source-linux
118107
- restore_cache:
119108
keys:
120-
- llvm-build-8-linux-v4
109+
- llvm-build-8-linux-v5
121110
- run:
122111
name: "Build LLVM"
123112
command: |
@@ -135,7 +124,7 @@ commands:
135124
make llvm-build
136125
fi
137126
- save_cache:
138-
key: llvm-build-8-linux-v4
127+
key: llvm-build-8-linux-v5
139128
paths:
140129
llvm-build
141130
- run:
@@ -144,7 +133,6 @@ commands:
144133
ln -s $PWD/llvm-build/bin/clang-8 /go/bin/clang-8
145134
ln -s $PWD/llvm-build/bin/ld.lld /go/bin/ld.lld-8
146135
ln -s $PWD/llvm-build/bin/wasm-ld /go/bin/wasm-ld-8
147-
- dep
148136
- run:
149137
name: "Test TinyGo"
150138
command: make test
@@ -175,20 +163,20 @@ commands:
175163
- run:
176164
name: "Install dependencies"
177165
command: |
178-
HOMEBREW_NO_AUTO_UPDATE=1 brew install go dep qemu
166+
HOMEBREW_NO_AUTO_UPDATE=1 brew install go qemu
179167
- restore_cache:
180168
keys:
181-
- llvm-source-8-macos-v2
169+
- llvm-source-8-macos-v3
182170
- run:
183171
name: "Fetch LLVM source"
184172
command: make llvm-source
185173
- save_cache:
186-
key: llvm-source-8-macos-v2
174+
key: llvm-source-8-macos-v3
187175
paths:
188176
- llvm
189177
- restore_cache:
190178
keys:
191-
- llvm-build-8-macos-v3
179+
- llvm-build-8-macos-v4
192180
- run:
193181
name: "Build LLVM"
194182
command: |
@@ -200,16 +188,13 @@ commands:
200188
make llvm-build
201189
fi
202190
- save_cache:
203-
key: llvm-build-8-macos-v3
191+
key: llvm-build-8-macos-v4
204192
paths:
205193
llvm-build
206194
- run:
207195
name: "Create LLVM symlinks"
208196
command: |
209197
ln -s $PWD/llvm-build/bin/clang-8 /usr/local/bin/clang-8
210-
- run:
211-
name: "Install Go dependencies"
212-
command: dep ensure --vendor-only
213198
- run:
214199
name: "Test TinyGo"
215200
command: make test
@@ -234,27 +219,21 @@ jobs:
234219
test-llvm8-go111:
235220
docker:
236221
- image: circleci/golang:1.11
237-
working_directory: /go/src/github.com/tinygo-org/tinygo
238222
steps:
239-
- test-linux:
240-
llvm: "-8"
223+
- test-linux
241224
test-llvm8-go112:
242225
docker:
243226
- image: circleci/golang:1.12
244-
working_directory: /go/src/github.com/tinygo-org/tinygo
245227
steps:
246-
- test-linux:
247-
llvm: "-8"
228+
- test-linux
248229
build-linux:
249230
docker:
250231
- image: circleci/golang:1.12
251-
working_directory: /go/src/github.com/tinygo-org/tinygo
252232
steps:
253233
- build-linux
254234
build-macos:
255235
macos:
256236
xcode: "10.1.0"
257-
working_directory: ~/go/src/github.com/tinygo-org/tinygo
258237
steps:
259238
- build-macos
260239

0 commit comments

Comments
 (0)