From 335c3c33a890d818dfaaa31add37d716f82d48ad Mon Sep 17 00:00:00 2001 From: ia Date: Tue, 6 Nov 2018 13:07:39 -0500 Subject: [PATCH 1/3] problem: Appveyor builds fail b/c sputnikvm-ffi fails compilation - add --verbose flag to build cmd for debugging --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 368131634..d4a115775 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ install: - cd c:\gopath\src\github.com\ETCDEVTeam - git clone https://github.com/ETCDEVTeam/sputnikvm-ffi - cd c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi - - cargo build --release + - cargo build --release --verbose - copy c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv - cd c:\gopath\src\github.com\ethereumproject\go-ethereum From 04ed648cb1bb94d17e935d3c39dcc28eb3e298f3 Mon Sep 17 00:00:00 2001 From: ia Date: Tue, 6 Nov 2018 13:18:03 -0500 Subject: [PATCH 2/3] problem: Appveyor builds fail b/c sputnikvm-ffi fails compilation - build sputnikvm-ffi from vendored source, and move c file to vendored source, adjusting go build tags accordingly --- appveyor.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d4a115775..325f87d02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,12 +24,14 @@ install: - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - rustup update - - cd c:\gopath\src\github.com\ETCDEVTeam - - git clone https://github.com/ETCDEVTeam/sputnikvm-ffi - - cd c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi + # - cd c:\gopath\src\github.com\ETCDEVTeam + # - git clone https://github.com/ETCDEVTeam/sputnikvm-ffi + # - cd c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi + - cd c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi - cargo build --release --verbose - - copy c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib - - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv + # Copy to both source and vendor dirs... b/c not sure ATM which one is used for building... hopefully vendor. + - copy c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib + - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv - cd c:\gopath\src\github.com\ethereumproject\go-ethereum - echo %VERSION_BASE% %VERSION% From fda767d96a349fad8224a620d71b1268ae3e38d2 Mon Sep 17 00:00:00 2001 From: ia Date: Tue, 6 Nov 2018 14:18:45 -0500 Subject: [PATCH 3/3] appveyor: tidy code, delete commented/debug code --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 325f87d02..ed93e18eb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,14 +24,13 @@ install: - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - rustup update - # - cd c:\gopath\src\github.com\ETCDEVTeam - # - git clone https://github.com/ETCDEVTeam/sputnikvm-ffi - # - cd c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi + # Build sputnikvm-ffi from go-ethereum/vendor dir (depend on 'dep' vendoring version control, instead of 'upstream master' vc). - cd c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi - cargo build --release --verbose - # Copy to both source and vendor dirs... b/c not sure ATM which one is used for building... hopefully vendor. - copy c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib + # Set build flag definitions. - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv + - cd c:\gopath\src\github.com\ethereumproject\go-ethereum - echo %VERSION_BASE% %VERSION%