Release candidate for v0.8.1 (#1154)

[agcapps]

V0.8.1 rc

[agcapps]

I don't understand how there is a conflict reported in scripts/spack/packages/axom/package.py. I don't see it on the "Changed files" tab. I'd appreciate some help with this.

[cyrush]

@agcapps the github review UI may not show files changed that are also conflicts

[cyrush]

Can you click, "resolve conflicts" to see the issue?
If not you will have to do it outside of github with git directly.

[agcapps]

Can you click, "resolve conflicts" to see the issue? If not you will have to do it outside of github with git directly.

I can't click "resolve conflicts," so we will have to use git outside the Github UI.

[gunney1]

I don't know our workflow for getting a release version, so maybe this is nothing, but... I see that I can merge rc-v0.8.1 into main just fine, but I get a conflict in scripts/spack/packages/axom/package.py when I try to merge develop into main. I can't tell exactly what merge github did to get the conflict. Did it try to merge into the intended branch?

[agcapps]

I don't know our workflow for getting a release version, so maybe this is nothing, but... I see that I can merge rc-v0.8.1 into main just fine, but I get a conflict in scripts/spack/packages/axom/package.py when I try to merge develop into main. I can't tell exactly what merge github did to get the conflict. Did it try to merge into the intended branch?

I agree. I don't understand the logic. To fix, please approve #1159 . I will merge that into develop. Then I can merge this PR.

[kennyweiss]

@agcapps -- something seems off with this PR -- if you're merging back from main into develop, I'd expect the only changes should be the ones from the rc-0.8.1 branch, i.e. the ones here: develop...rc-v0.8.1

It's not clear to me why there are merge conflicts or 46 file changes. Is it possible that your develop and/or main branches weren't up to date before creating this PR?

[kennyweiss]

I'm guessing that we need to close this PR and create a new one to merge main back into develop -- there should only be a few small changes related to the changed version.