Closed SobhanMP closed 1 year ago
the CI is going to fail because NOMAD_jll 4.2 is not available in the registery.
@SobhanMP
The main developer of NOMAD was not working the last three weeks (summer holidays) but it fixed the issue with MinGW compilation today!
It will test if everything works fine tomorrow. We should be able to update the build_tarballs.jl
after that.
cool
Merging #60 (bbb5c62) into master (04281ea) will increase coverage by
0.51%
. The diff coverage is100.00%
.
@@ Coverage Diff @@
## master #60 +/- ##
==========================================
+ Coverage 96.38% 96.90% +0.51%
==========================================
Files 3 3
Lines 332 323 -9
==========================================
- Hits 320 313 -7
+ Misses 12 10 -2
Impacted Files | Coverage Δ | |
---|---|---|
src/c_wrappers.jl | 93.84% <100.00%> (+0.29%) |
:arrow_up: |
src/core.jl | 98.46% <100.00%> (+1.27%) |
:arrow_up: |
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
@SobhanMP I can't merge the PR due to conflits. @solomonl Can you review the PR ?
what branch do you want to merge it to?
I want to merge it to
master
:thinking:
❯ git pull upstream master From https://github.com/bbopt/NOMAD.jl
maybe use the command line instructions?
❯ git pull upstream master From https://github.com/bbopt/NOMAD.jl
- branch master -> FETCH_HEAD Already up to date.
maybe use the command line instructions?
Did you try git rebase upstream/master
?
The other option Squash and merge
is available for me but I don't understand why I can't do Rebase and merge
.
Thanks @SobhanMP ! I did a squash + merge.
removes the deprecated options. should be merged after https://github.com/JuliaPackaging/Yggdrasil/pull/5182 and https://github.com/bbopt/NOMAD.jl/pull/59 are merged. Alternatively, merge this and close #59 w/o squashing. The binaries can be found https://github.com/SobhanMP/NOMAD_jll.jl