Skip to content

[Update](tzdb) update Doris tzfiles to 2024a - #32648

Merged
yiguolei merged 1 commit into
apache:masterfrom
zclllyybb:tzupdate
Mar 26, 2024
Merged

[Update](tzdb) update Doris tzfiles to 2024a#32648
yiguolei merged 1 commit into
apache:masterfrom
zclllyybb:tzupdate

Conversation

@zclllyybb

@zclllyybbzclllyybb commented Mar 21, 2024

Copy link
Copy Markdown
Contributor

Proposed changes

Issue Number: close #xxx

doc pr: apache/doris-website#451

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@doris-robot

Copy link
Copy Markdown

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@github-actions

Copy link
Copy Markdown
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:
----------
In build-for-release.sh line 160:
cd `ls -F | grep "tzdb-.*/$"`
^------------------------^ SC2046 (warning): Quote this to prevent word splitting.
^------------------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.
^-- SC2010 (warning): Don't use ls | grep. Use a glob or a for loop with a condition to allow non-alphanumeric filenames.
Did you mean: cd $(ls -F | grep "tzdb-.*/$")
In build-for-release.sh line 166:
rm -r `ls | grep -v "zoneinfo.tar.gz"`
^-- SC2046 (warning): Quote this to prevent word splitting.
^-- SC2006 (style): Use $(...) notation instead of legacy backticks `...`.
^-- SC2010 (warning): Don't use ls | grep. Use a glob or a for loop with a condition to allow non-alphanumeric filenames.
Did you mean: rm -r $(ls | grep -v "zoneinfo.tar.gz")
For more information:
https://www.shellcheck.net/wiki/SC2010 -- Don't use ls | grep. Use a glob o...
https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le...
----------
You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
# shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.
shfmt errors

'shfmt ' returned error 1 finding the following formatting issues:
----------
--- build-for-release.sh.orig
+++ build-for-release.sh
@@ -146,7 +146,7 @@
echo "JAR: ${OUTPUT_EXT}"
# Sync the latest timezone date files
-if ! command -v lzip > /dev/null 2>&1; then
+if ! command -v lzip >/dev/null 2>&1; then
echo "need lzip to undecompresse the tzdb file but does not exist."
exit 1
fi
@@ -157,13 +157,13 @@
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
lzip -d tzdb-latest.tar.lz
tar -xf tzdb-latest.tar
-cd `ls -F | grep "tzdb-.*/$"`
+cd $(ls -F | grep "tzdb-.*/$")
make TOPDIR="../zone_output" install
cd ../zone_output/usr/share
tar -czf zoneinfo.tar.gz zoneinfo
mv zoneinfo.tar.gz ../../..
cd ../../..
-rm -r `ls | grep -v "zoneinfo.tar.gz"`
+rm -r $(ls | grep -v "zoneinfo.tar.gz")
popd
echo "Succeed to get newest time zone database file"
----------
You can reformat the above files to meet shfmt's requirements by typing:
shfmt -w filename

@github-actions

Copy link
Copy Markdown
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:
----------
In build-for-release.sh line 160:
cd $(ls -F | grep "tzdb-.*/$")
^-------------------------^ SC2046 (warning): Quote this to prevent word splitting.
^-- SC2010 (warning): Don't use ls | grep. Use a glob or a for loop with a condition to allow non-alphanumeric filenames.
In build-for-release.sh line 166:
rm -r $(ls | grep -v "zoneinfo.tar.gz")
^-- SC2046 (warning): Quote this to prevent word splitting.
^-- SC2010 (warning): Don't use ls | grep. Use a glob or a for loop with a condition to allow non-alphanumeric filenames.
For more information:
https://www.shellcheck.net/wiki/SC2010 -- Don't use ls | grep. Use a glob o...
https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
----------
You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
# shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.
shfmt errors
'shfmt ' found no issues.

@github-actions

Copy link
Copy Markdown
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:
----------
In build-for-release.sh line 160:
cd $(ls -F | grep "tzdb-.*/$")
^-------------------------^ SC2046 (warning): Quote this to prevent word splitting.
^-- SC2010 (warning): Don't use ls | grep. Use a glob or a for loop with a condition to allow non-alphanumeric filenames.
For more information:
https://www.shellcheck.net/wiki/SC2010 -- Don't use ls | grep. Use a glob o...
https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
----------
You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
# shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.
shfmt errors
'shfmt ' found no issues.

@zclllyybb

Copy link
Copy Markdown
ContributorAuthor

run buildall

@zclllyybb

Copy link
Copy Markdown
ContributorAuthor

run buildall

@zclllyybbzclllyybb changed the title [Enhancement](release-step) Get newest tzdb files when build for release[Update](tzdb) update Doris tzfiles to 2024aMar 22, 2024
@zclllyybb

Copy link
Copy Markdown
ContributorAuthor

run buildall

@github-actions

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Mar 26, 2024
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@yiguolei
yiguolei merged commit 2bfafdb into apache:masterMar 26, 2024
@zclllyybb
zclllyybb deleted the tzupdate branch March 26, 2024 22:29
mongo360 pushed a commit to mongo360/doris that referenced this pull request Aug 16, 2024
HappenLee pushed a commit to HappenLee/incubator-doris that referenced this pull request Apr 24, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by one committer.dev/2.0.8-mergedreviewedusercaseImportant user case type label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@zclllyybb@doris-robot@BiteTheDDDDt@yiguolei@xiaokang