remove last traces of Go support

You'll have to run `chmod -R 755 vendor/go && rm -rf vendor/go` locally.
This commit is contained in:
Ștefan Talpalaru 2020-04-15 14:38:42 +02:00
parent d559f4ee89
commit 7435c2010f
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
7 changed files with 5 additions and 21 deletions

View File

@ -34,9 +34,8 @@ build_script:
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% fetch-dlls - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% fetch-dlls
test_script: test_script:
# the "go-checks" target fails in AppVeyor, for some reason; easier to disable than to debug - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% LOG_LEVEL=TRACE
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_GO_CHECKS=1 LOG_LEVEL=TRACE - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image"
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_GO_CHECKS=1 LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image" - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_TEST_FIXTURES_SCRIPT=1 test
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_TEST_FIXTURES_SCRIPT=1 DISABLE_GO_CHECKS=1 test
deploy: off deploy: off

4
.gitignore vendored
View File

@ -6,10 +6,6 @@ build/
# Nimble packages # Nimble packages
/vendor/.nimble /vendor/.nimble
# Go packages
/vendor/go
!/vendor/go/src/github.com/libp2p/go-libp2p-daemon
# ntags/ctags output # ntags/ctags output
/tags /tags

5
.gitmodules vendored
View File

@ -3,11 +3,6 @@
url = https://github.com/status-im/nim-eth2-scenarios url = https://github.com/status-im/nim-eth2-scenarios
ignore = dirty ignore = dirty
branch = master branch = master
[submodule "vendor/go/src/github.com/libp2p/go-libp2p-daemon"]
path = vendor/go/src/github.com/libp2p/go-libp2p-daemon
url = https://github.com/libp2p/go-libp2p-daemon.git
ignore = dirty
branch = master
[submodule "vendor/nim-blscurve"] [submodule "vendor/nim-blscurve"]
path = vendor/nim-blscurve path = vendor/nim-blscurve
url = https://github.com/status-im/nim-blscurve.git url = https://github.com/status-im/nim-blscurve.git

View File

@ -1,4 +1,4 @@
language: go language: c
dist: bionic dist: bionic
@ -6,16 +6,12 @@ dist: bionic
cache: cache:
directories: directories:
- vendor/nimbus-build-system/vendor/Nim/bin - vendor/nimbus-build-system/vendor/Nim/bin
- vendor/go/bin
- jsonTestsCache - jsonTestsCache
git: git:
# when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X" # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
depth: 10 depth: 10
go:
- "1.12.x"
matrix: matrix:
include: include:
- os: linux - os: linux

1
Jenkinsfile vendored
View File

@ -7,7 +7,6 @@ def runStages() {
cache(maxCacheSize: 250, caches: [ cache(maxCacheSize: 250, caches: [
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"], [$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"],
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/go/bin"],
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"] [$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
]) { ]) {
stage("Build") { stage("Build") {

@ -1 +0,0 @@
Subproject commit cd8b111a1ae4c2bdc02d0cdc3a78cb3d9977849a

@ -1 +1 @@
Subproject commit 0cce46e1260b053349d0d6f337f5d67a7bc14462 Subproject commit 3ff26b54ebc2b1bc06d29af8043c3ac8ee4145a3