-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Let the nightlies call themselves 'nightly', the return. #13581
Conversation
This pull request is stale because it has been open for 14 days with no activity. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd tweak a few more things but these are just cosmetics. In terms of functionality this now looks good.
Also, needs rebase and commit squashing. |
Is there any difference in squashing commits manually via console, i.e. |
Probably just description. Also, I'm not sure if it creates a merge commit (and I'd prefer if it did). I think it's fine to use it when you know you want a single commit. |
@r0qs I think this is still not rebased on latest |
Yes. I will rebase and squash the commit. I was waiting for your input in the previous comments to do that :) |
369c4b0
to
da80391
Compare
@r0qs #13581 (comment) is the only thing left. After that it's good to merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good to merge but you need to squash commits anyway so I have one extra suggestion for nicer numeric conditions.
Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
Since PR#10772, nightly builds started to call themselves
ci
during the build.This happens because the nightly workflow in the solc-bin repo invokes the
build_emscripten.sh
from the solidity repo, in line 78, after the script set theprerelease.txt
to the nightly version (line 53), thus overwriting theprerelease.txt
created by the workflow.The creation of the
prerelease.txt
file was added to the nightly workflow here ethereum/solc-bin#64 to fix the issue when nightly builds were calling themselvesdevelop
. Now, they want to beci
, but we should not allow it!You can see the error by running:
Which returns:
0.8.15-ci.2022.5.27+commit.095cc647.Emscripten.clang
Instead of:
0.8.15-nightly.2022.5.27+commit.095cc647.Emscripten.clang
EDITED:
The PR adds a condition to not modify theprerelease.txt
file if it is anightly
build.The PR adds an optional argument to set the release binary name in the
build
script and also modifies theemscripten_build
script to receive optional parameters for the same purpose. Parameters were used in the latter instead of arguments since the script would have more than one optional argument, requiring the user to provide the first argument even if he only wants to set the second.The docker script was also modified to forward the parameters to the CI scripts.
If no parameters are given, the script behaves as before.
It should be merged before ethereum/solc-bin#123.