Skip to content

Commit

Permalink
Use check_mild instead of check
Browse files Browse the repository at this point in the history
* TZDB has been updated to better handle our use case
  • Loading branch information
jodastephen committed Sep 15, 2024
1 parent 06a30c4 commit 48d477f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
git describe --abbrev=7 --dirty
git describe --match "[0-9][0-9][0-9][0-9][a-z]*" --abbrev=7 --dirty
git describe --match '[0-9][0-9][0-9][0-9][a-z]*' --abbrev=7 --dirty
make check VERSION="${{ env.TAG_VERSION }}" ZONETABLES="zone.tab"
make check_mild VERSION="${{ env.TAG_VERSION }}" ZONETABLES="zone.tab"
make tarballs VERSION="${{ env.TAG_VERSION }}"
ls -la
sha512sum tzcode${{ env.TAG_VERSION }}.tar.gz > tzcode${{ env.TAG_VERSION }}.tar.gz.sha512
Expand All @@ -70,3 +70,4 @@ jobs:

# Use git rest --hard to ensure the state is what make expects, if this is not done the version file is incorrect in the output
# ZONETABLES is set to remove zone1970.tab, as the Makefile validation doesn't cover our use case
# check_mild is used instead of check, as the Makefile validation doesn't cover our use case
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
git tag --list
git reset --hard ${{ env.TAG_VERSION }}
ls -la
make check VERSION="${{ env.TAG_VERSION }}" ZONETABLES="zone.tab"
make check_mild VERSION="${{ env.TAG_VERSION }}" ZONETABLES="zone.tab"
make tarballs VERSION="${{ env.TAG_VERSION }}"
ls -la
sha512sum tzcode${{ env.TAG_VERSION }}.tar.gz > tzcode${{ env.TAG_VERSION }}.tar.gz.sha512
Expand All @@ -75,3 +75,4 @@ jobs:
# Use git rest --hard to ensure the state is what make expects, if this is not done the version file is incorrect in the output
# ZONETABLES is set to remove zone1970.tab, as the Makefile validation doesn't cover our use case
# check_mild is used instead of check, as the Makefile validation doesn't cover our use case
2 changes: 1 addition & 1 deletion .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ jobs:
run: |
cd global
ls -la
make check VERSION="test" ZONETABLES="zone.tab"
make check_mild VERSION="test" ZONETABLES="zone.tab"
make tarballs VERSION="test"
ls -la
5 changes: 0 additions & 5 deletions GlobalTzMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,6 @@ void generate() throws IOException {
// this is lenient, in case the Makefile changes again
var makefile = ensureFileLoaded("Makefile");
makefile.removeLines("\t\t -v backcheck=backward");
makefile.setInsertPoint("check_now:", "now.ck:", 1, false);
// remove check_now
makefile.addLine("\t\ttouch $@");
makefile.addLine("# Original code:");
makefile.addLine("check_now_original:\tchecknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab");
}

// processes the action
Expand Down

0 comments on commit 48d477f

Please sign in to comment.