Skip to content

Fix up checks in Makefile and make them portable #1661

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Sep 15, 2023
Merged

Fix up checks in Makefile and make them portable #1661

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6fb2318
Reference HEAD in Makefile (more portable than head)
EliahKagan Sep 11, 2023
335d03b
Have Makefile use git tag to sort the tags
EliahKagan Sep 11, 2023
b1c61d9
Make "git tag" sort our SemVer-ish tags correctly
EliahKagan Sep 13, 2023
cc202cc
Improve when and how Makefile suggests virtual env
EliahKagan Sep 13, 2023
b54c346
Use "python" in the virtual env, "python3" outside
EliahKagan Sep 13, 2023
ae9405a
LF line endings for scripts that may need them
EliahKagan Sep 13, 2023
f5da163
Have "make release" check other release preconditions
EliahKagan Sep 13, 2023
5cf7f97
Fix non-venv branch always failing
EliahKagan Sep 13, 2023
6495d84
Extract checks from release target to script
EliahKagan Sep 14, 2023
4b1c564
Extract build from force_release target to script
EliahKagan Sep 14, 2023
729372f
Prevent buggy interaction between MinGW and WSL
EliahKagan Sep 14, 2023
ba84db4
Fix message wording that was opposite of intended
EliahKagan Sep 14, 2023
de40e68
Ignore some other virtual environment directories
EliahKagan Sep 14, 2023
693d041
make `.gitattributes` file more generic
Byron Sep 15, 2023
962f747
submodules don't contribute to the release; ignore their changes
Byron Sep 15, 2023
d18d90a
Use 'echo' where possible to avoid explicit newlines
Byron Sep 15, 2023
5919f8d
Be explicit on how to interpret the data table
Byron Sep 15, 2023
1e0b3f9
refinements to `build-reelase.sh`
Byron Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Be explicit on how to interpret the data table
  • Loading branch information
@Byron
Byron committed Sep 15, 2023
commit 5919f8d04bccfaf0c98ae032437635d1a2de656b
2 changes: 1 addition & 1 deletion check-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ echo 'Checking that ALL changes are committed.'
git status -s --ignore-submodules
test -z "$(git status -s --ignore-submodules)"

echo 'Gathering current version, latest tag, and current HEAD commit info.'
version_version="$(cat "$version_path")"
changes_version="$(awk '/^[0-9]/ {print $0; exit}' "$changes_path")"
config_opts="$(printf ' -c versionsort.suffix=-%s' alpha beta pre rc RC)"
Expand All @@ -33,6 +32,7 @@ head_sha="$(git rev-parse HEAD)"
latest_tag_sha="$(git rev-parse "$latest_tag")"

# Display a table of all the current version, tag, and HEAD commit information.
echo $'\nThe VERSION must be the same in all locations, and so must the HEAD and tag SHA'
printf '%-14s = %s\n' 'VERSION file' "$version_version" \
'changes.rst' "$changes_version" \
'Latest tag' "$latest_tag" \
Expand Down