search

Zilliqa / scilla

Scilla - A Smart Contract Intermediate Level Language
https://scilla-lang.org
GNU General Public License v3.0
241 stars 79 forks source link

Release v0.12.1 - use vcpkg to compile Scilla (and Ubuntu 20.04) #1178

Closed yaron-zilliqa closed 1 year ago

jjcnn commented 1 year ago

We might not even need to graft the PR to the 0.12 branch. We could just create the 0.13 branch once we've merged this to master, and then use 0.13 from then on?

yaron-zilliqa commented 1 year ago

This PR reverts changes to Scilla that we have made on master since the 0.12 branch was created. See e.g. ScillaParser.mly and EvalBuiltins.ml.

I propose that you create a branch from master to make the changes, and then we graft that PR onto the 0.12 branch. Doing it the way you have done it here creates unacceptable semantic changes to Scilla.

Further, we will need help maintaining this new build system.

I can easily rebase to master to achieve this, but given that you've made a semantic (breaking?) change, wouldn't that be a new version (i.e. 0.13)? once there's a release branch, one usually just adds fixes to it and not additional development.

We might not even need to graft the PR to the 0.12 branch. We could just create the 0.13 branch once we've merged this to master, and then use 0.13 from then on?

Yup - we'd like to use 0.13 actually in the upcoming Zilliqa 8.3 release. I just used 0.12 because there was no 0.13 yet so thought you were still finalizing things. I think that's the best solution.

jjcnn commented 1 year ago

This PR reverts changes to Scilla that we have made on master since the 0.12 branch was created. See e.g. ScillaParser.mly and EvalBuiltins.ml. I propose that you create a branch from master to make the changes, and then we graft that PR onto the 0.12 branch. Doing it the way you have done it here creates unacceptable semantic changes to Scilla. Further, we will need help maintaining this new build system.

I can easily rebase to master to achieve this, but given that you've made a semantic (breaking?) change, wouldn't that be a new version (i.e. 0.13)? once there's a release branch, one usually just adds fixes to it and not additional development.

Yeah, but then you can't merge those changes to master, which is what you are proposing to do in this PR.

We might not even need to graft the PR to the 0.12 branch. We could just create the 0.13 branch once we've merged this to master, and then use 0.13 from then on?

Yup - we'd like to use 0.13 actually in the upcoming Zilliqa 8.3 release. I just used 0.12 because there was no 0.13 yet so thought you were still finalizing things. I think that's the best solution.

Agreed.