Skip to content

Commit

Permalink
Merge pull request #19577 from bradcray/build-version-1-for-1-26
Browse files Browse the repository at this point in the history
Bump build version to 1 on 1.26 branch to reflect late-breaking changes

[reviewed by @ronawho]

If I've kept my facts straight, this should bump the build version for the
1.26 branch to "1" the next time we respin the tarball, reflecting the
changes in #19575.
Unfortunately, I won't feel confident that this is working as intended
until we merge and try to respin the tarball (either manually or via
Jenkins).

Elliot points out that with the current `--version` logic, this will only
show up with `--devel --version` (which looks like a mistake to me,
but one to fix back on `main` rather than here).
  • Loading branch information
bradcray committed Mar 31, 2022
2 parents 06b1198 + fd461cc commit d80a127
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ UPDATE_BUILD_VERSION = $(CHPL_MAKE_HOME)/util/devel/updateBuildVersion
$(BUILD_VERSION_FILE): FORCE
@({ test -e $(CHPL_MAKE_HOME)/.git ; } && \
test -x $(UPDATE_BUILD_VERSION) && $(UPDATE_BUILD_VERSION) $@ $(CHPL_MAKE_HOME)) || \
test -r $(BUILD_VERSION_FILE) || (echo '"0"' > $@);
test -r $(BUILD_VERSION_FILE) || (echo '"1"' > $@);

$(CHPL_MAKE_HOME)/configured-prefix:
echo > $(CHPL_MAKE_HOME)/configured-prefix
Expand Down

0 comments on commit d80a127

Please sign in to comment.