Skip to content

Chore/upgrade builder to latest Rust SDK#2375

Merged
j16r merged 2 commits intodevelopfrom
chore/upgrade-builder-go-13
Feb 27, 2020
Merged

Chore/upgrade builder to latest Rust SDK#2375
j16r merged 2 commits intodevelopfrom
chore/upgrade-builder-go-13

Conversation

@samsondav
Copy link
Copy Markdown
Contributor

@samsondav samsondav commented Feb 25, 2020

Note: blocked by this issue

apache/teaclave-sgx-sdk#209

@samsondav samsondav force-pushed the chore/upgrade-builder-go-13 branch 3 times, most recently from 8dd1980 to fa690ea Compare February 26, 2020 00:43
@samsondav samsondav changed the title Chore/upgrade builder go 13 Chore/upgrade builder to latest Rust SDK Feb 26, 2020
@samsondav samsondav force-pushed the chore/upgrade-builder-go-13 branch 2 times, most recently from 4aed061 to 834ed19 Compare February 26, 2020 15:10
@j16r
Copy link
Copy Markdown
Contributor

j16r commented Feb 26, 2020

The rust_test above works for me with the specified image - so I'm suspicious that 1.0.27 has been updated / diverged. Looking into it ...

@j16r
Copy link
Copy Markdown
Contributor

j16r commented Feb 26, 2020

Hmm that's not it:

smartcontract/builder              1.0.27              sha256:3acacdceee2557bcedea70e201248eb4b0bc109f1dc4b87de0a8ecb9f38b4849   f265f2438a4a        10 days ago         4.34GB
dockerhub: sha256:3acacdceee2557bcedea70e201248eb4b0bc109f1dc4b87de0a8ecb9f38b4849

@samsondav samsondav force-pushed the chore/upgrade-builder-go-13 branch from 5d687b4 to 6633d95 Compare February 26, 2020 19:05
@samsondav samsondav requested a review from j16r February 26, 2020 19:06
@samsondav
Copy link
Copy Markdown
Contributor Author

samsondav commented Feb 26, 2020

It compiles just fine. Only has the warning.

I removed it FYI: apache/teaclave-sgx-sdk#209

@j16r
Copy link
Copy Markdown
Contributor

j16r commented Feb 26, 2020

@samsondav
Copy link
Copy Markdown
Contributor Author

samsondav commented Feb 26, 2020

@j16r Oops, turns out I forgot to bump the image version in circle config. I think it will build OK now.

One point to note - I removed compiler-rt.

See: apache/teaclave-sgx-sdk#209

I don’t know if that’s there because it was copypasta in the original Makefile, or if we decided we needed it for some reason. We can put this back and live with the warning if you prefer?

@j16r
Copy link
Copy Markdown
Contributor

j16r commented Feb 26, 2020

Yeah I had pushed commits to do all those things and it was still failing (looks like you force pushed over them).

@samsondav
Copy link
Copy Markdown
Contributor Author

@j16r Ah dammit. Didnt know you were comitting to this also. Any way you can pull and merge so we can get your commits in too?

@j16r
Copy link
Copy Markdown
Contributor

j16r commented Feb 26, 2020

It's fine, your commits do the same thing.

@samsondav samsondav force-pushed the chore/upgrade-builder-go-13 branch 3 times, most recently from 34b6906 to 624435c Compare February 27, 2020 00:12
@samsondav samsondav force-pushed the chore/upgrade-builder-go-13 branch from c2fdec2 to 8d5c609 Compare February 27, 2020 01:08
@samsondav samsondav marked this pull request as ready for review February 27, 2020 01:35
@j16r j16r merged commit 248d5c8 into develop Feb 27, 2020
@j16r j16r deleted the chore/upgrade-builder-go-13 branch February 27, 2020 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants