diff options
author | Ayke van Laethem <[email protected]> | 2019-05-27 12:30:44 +0200 |
---|---|---|
committer | Ron Evans <[email protected]> | 2019-05-27 18:42:36 +0200 |
commit | 2f95a5d452df23234ddd77f238a76aeaf12172dc (patch) | |
tree | 1f9d8b52de11c47500a455292ecc4eddd753e1b5 | |
parent | eb1d834dd45e274e935064f5ab363556ee91fd5a (diff) | |
download | tinygo-2f95a5d452df23234ddd77f238a76aeaf12172dc.tar.gz tinygo-2f95a5d452df23234ddd77f238a76aeaf12172dc.zip |
ci: use go modules instead of dep
This also updates the LLVM build to include this commit:
https://github.com/llvm-mirror/llvm/commit/d519e424c503d2d2a723284664a509a6cd5401a8
-rw-r--r-- | .circleci/config.yml | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index a1b059eb2..94b1f9a44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,23 +40,16 @@ commands: sudo tar -C /usr/local -xf node-v10.15.1-linux-x64.tar.xz sudo ln -s /usr/local/node-v10.15.1-linux-x64/bin/node /usr/bin/node rm node-v10.15.1-linux-x64.tar.xz - dep: - steps: - - run: - name: "Install Go dependencies" - command: | - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh - dep ensure --vendor-only llvm-source-linux: steps: - restore_cache: keys: - - llvm-source-8-v2 + - llvm-source-8-v3 - run: name: "Fetch LLVM source" command: make llvm-source - save_cache: - key: llvm-source-8-v2 + key: llvm-source-8-v3 paths: - llvm smoketest: @@ -66,21 +59,17 @@ commands: steps: - run: make smoketest-no-avr test-linux: - parameters: - llvm: - type: string steps: - checkout - submodules - apt-dependencies: - llvm: <<parameters.llvm>> + llvm: "-8" - install-node - restore_cache: keys: - go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }} - go-cache-{{ checksum "Gopkg.lock" }} - llvm-source-linux - - dep - run: go install . - run: go test -v - run: make gen-device -j4 @@ -117,7 +106,7 @@ commands: - llvm-source-linux - restore_cache: keys: - - llvm-build-8-linux-v4 + - llvm-build-8-linux-v5 - run: name: "Build LLVM" command: | @@ -135,7 +124,7 @@ commands: make llvm-build fi - save_cache: - key: llvm-build-8-linux-v4 + key: llvm-build-8-linux-v5 paths: llvm-build - run: @@ -144,7 +133,6 @@ commands: ln -s $PWD/llvm-build/bin/clang-8 /go/bin/clang-8 ln -s $PWD/llvm-build/bin/ld.lld /go/bin/ld.lld-8 ln -s $PWD/llvm-build/bin/wasm-ld /go/bin/wasm-ld-8 - - dep - run: name: "Test TinyGo" command: make test @@ -175,20 +163,20 @@ commands: - run: name: "Install dependencies" command: | - HOMEBREW_NO_AUTO_UPDATE=1 brew install go dep qemu + HOMEBREW_NO_AUTO_UPDATE=1 brew install go qemu - restore_cache: keys: - - llvm-source-8-macos-v2 + - llvm-source-8-macos-v3 - run: name: "Fetch LLVM source" command: make llvm-source - save_cache: - key: llvm-source-8-macos-v2 + key: llvm-source-8-macos-v3 paths: - llvm - restore_cache: keys: - - llvm-build-8-macos-v3 + - llvm-build-8-macos-v4 - run: name: "Build LLVM" command: | @@ -200,7 +188,7 @@ commands: make llvm-build fi - save_cache: - key: llvm-build-8-macos-v3 + key: llvm-build-8-macos-v4 paths: llvm-build - run: @@ -208,9 +196,6 @@ commands: command: | ln -s $PWD/llvm-build/bin/clang-8 /usr/local/bin/clang-8 - run: - name: "Install Go dependencies" - command: dep ensure --vendor-only - - run: name: "Test TinyGo" command: make test - run: @@ -234,27 +219,21 @@ jobs: test-llvm8-go111: docker: - image: circleci/golang:1.11 - working_directory: /go/src/github.com/tinygo-org/tinygo steps: - - test-linux: - llvm: "-8" + - test-linux test-llvm8-go112: docker: - image: circleci/golang:1.12 - working_directory: /go/src/github.com/tinygo-org/tinygo steps: - - test-linux: - llvm: "-8" + - test-linux build-linux: docker: - image: circleci/golang:1.12 - working_directory: /go/src/github.com/tinygo-org/tinygo steps: - build-linux build-macos: macos: xcode: "10.1.0" - working_directory: ~/go/src/github.com/tinygo-org/tinygo steps: - build-macos |