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

Add .gitversion file to Linux archive #2118

Merged
merged 9 commits into from
Dec 26, 2023
Merged

Conversation

dvdmuckle
Copy link
Contributor

Also renames a couple things in the GHA workflow file for building after a release.

@dvdmuckle
Copy link
Contributor Author

I need to do some additional tests but this is how I'm looking to address #1827

@Rixxan
Copy link
Contributor

Rixxan commented Dec 24, 2023

This all looks good so far. Let me know when your testing is complete and I'll do my own passes through it :)

@dvdmuckle
Copy link
Contributor Author

Finished my testing! I undid the renames I mentioned in the PR comment, as I didn't realize renaming GHA workflows changes the link to them.

@@ -11,7 +11,7 @@ jobs:
variables:
outputs:
sem_ver: ${{ steps.var.outputs.sem_ver }}
archive_exclusions: ${{ steps.var.outputs.archive_exclusions }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find archive_exclusions being used anywhere in the rest of the file, so I removed it

@dvdmuckle
Copy link
Contributor Author

Realized from the comment you left on #1827 that the checks should be done in the other order (IE, check for git rev-parse --short HEAD, then fall back to .gitversion if we don't get a valid git sha back). I can change the behavior here if you want.

@Rixxan
Copy link
Contributor

Rixxan commented Dec 24, 2023

Ideally, yes the preference should be the git HEAD, and then the .gitversion file, and then an error out to "unknown".

@dvdmuckle dvdmuckle changed the base branch from main to develop December 25, 2023 02:26
@dvdmuckle
Copy link
Contributor Author

@Rixxan Done!

Copy link
Contributor

@Rixxan Rixxan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me! Thanks for contributing this.

@Rixxan Rixxan merged commit 1976ddb into EDCD:develop Dec 26, 2023
1 check passed
@Rixxan Rixxan linked an issue Dec 26, 2023 that may be closed by this pull request
@Rixxan Rixxan added this to the 5.10.1 milestone Dec 26, 2023
@Rixxan Rixxan added Linux Linux-specific issues. Staged Feature Complete and in Testing for Next Release labels Dec 26, 2023
@Rixxan Rixxan self-assigned this Dec 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Linux Linux-specific issues. Staged Feature Complete and in Testing for Next Release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Source Tarball from Release Does Not Display Git Hash
2 participants