Skip to content
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

Release 2.2.3 #32

Merged
merged 4,189 commits into from
Apr 27, 2020
Merged

Release 2.2.3 #32

merged 4,189 commits into from
Apr 27, 2020

Conversation

hobywan
Copy link
Member

@hobywan hobywan commented Apr 24, 2020

There were too many conflicts and I used another method to resolve them.
Hence the commits were not squashed, sorry.
EDIT: I can squash them prior to merge.

hobywan and others added 14 commits April 16, 2020 18:02
…master

* commit 'b09aa842aa9b9212260a2fc88075510089013600':
  Fix missing material centroid in debug mode
  Fix last unused variable
  Fix missing executor for serial runs
  Fix last issues
  Fix missing tangram headers
  Fix tests structure
  Fix multi-material driver swept-face test
  Fix multi-material uber driver test
  Fix multi-material distributed driver test
  Fix multi-material first-order driver test
  Fix multi-material second-order driver test
  Fix multi-material distributed driver test
  Fix number of materials without Tangram
…ings to master

* commit 'ed8599e51dabecfa7998c768ef728587ffd811e4':
  fixed a whitespace nit
  added remap timing breakouts to the swept face app
* commit '81a8494ed92f07eba138127f68fce7011565344b':
  Allow to create empty state
  Allow to create empty swarm
  Ignore installation directory
@hobywan
Copy link
Member Author

hobywan commented Apr 25, 2020

It needs the version 1.1.4 of Wonton to pass.

@raovgarimella
Copy link
Collaborator

Hoby
I think your method is the right thing to do. I have been saying for a while that we have to effectivelly overwrite the source on the github repo with the one from the xcp-stash using "checkout --ours/theirs". It looks like that's what you have done.

I would recommend adding this info to the confluence page on github releasing workflow.
Rao

@hobywan
Copy link
Member Author

hobywan commented Apr 27, 2020

I would recommend adding this info to the confluence page on github releasing workflow.

Okay. I will.

@hobywan
Copy link
Member Author

hobywan commented Apr 27, 2020

I updated the Wonton hash and Travis tests should normally pass.
Please review at your earliest convenience so that it can be merged as soon as they are completed.

@codecov
Copy link

codecov bot commented Apr 27, 2020

Codecov Report

Merging #32 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #32   +/-   ##
=======================================
  Coverage   67.56%   67.56%           
=======================================
  Files          77       77           
  Lines       12368    12368           
  Branches     2013     2013           
=======================================
  Hits         8357     8357           
  Misses       3455     3455           
  Partials      556      556           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6cea523...6cea523. Read the comment docs.

@hobywan hobywan merged commit f59ce8d into master Apr 27, 2020
@hobywan hobywan deleted the release_2.2.3 branch April 27, 2020 22:02
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.

None yet

9 participants