You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by "rubenada (via GitHub)" <gi...@apache.org> on 2026/07/31 14:31:38 UTC
[PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
rubenada opened a new pull request, #5136:
URL: https://github.com/apache/calcite/pull/5136
<!--
Thanks for sending a pull request! Here are some critical tips for you:
1. READ THE GUIDE FIRST: https://calcite.apache.org/develop/#contributing
*For significant contributions, please discuss on the dev mailing list or Jira BEFORE coding.*
2. JIRA IS USUALLY MANDATORY: Ensure you have created an issue on the Calcite Jira:
https://issues.apache.org/jira/projects/CALCITE/issues
*Check existing issues first to avoid duplicates.*
*Note: A Jira is NOT required for typos and cosmetic changes (i.e., changes that are neither bugs nor features).*
3. TIMING: Strongly recommended to create the Jira BEFORE you start writing code (e.g., a day or so before posting a PR).
This gives others a chance to weigh in on your specification.
4. CRITICAL CONSISTENCY RULE
The following three items MUST match exactly in wording and meaning:
(A) The Jira Issue Title
(B) This Pull Request Title
(C) Your Git Commit Message
Format: [CALCITE-XXXX] <Description>
Example: [CALCITE-0000] Add IF NOT EXISTS clause to CREATE TABLE
Guidelines for a good Title:
- Illustrate using SQL keywords (in ALL-CAPS) rather than Java method names.
- Focus on the specification and user experience, not the implementation.
- Make it clear whether it is a bug or a feature.
- Use words like "should" to indicate desired behavior vs. current behavior (e.g., "Validator should not close model file").
5. REPRODUCTION: If fixing a bug, please provide a concise SQL example or test case to reproduce the issue for a faster review.
6. TESTING: Ensure `./gradlew build` passes and appropriate tests are added/updated.
-->
## Jira Link
[CALCITE-5584](https://issues.apache.org/jira/browse/CALCITE-5584)
## Changes Proposed
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR.
-->
Adjust publish-non-release-website-updates.yml to be able to process up to 20 commits (limit of github.event.commits); that should be enough for Calcite, where normally only one or a few commits land together.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "sonarqubecloud[bot] (via GitHub)" <gi...@apache.org>.
sonarqubecloud[bot] commented on PR #5136:
URL: https://github.com/apache/calcite/pull/5136#issuecomment-5239284406
## [](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136) **Quality Gate passed**
Issues
 [0 New issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=ACCEPTED)
Measures
 [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0.0% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_coverage&view=list)
 [0.0% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_duplicated_lines_density&view=list)
<!-- sqra-placement-anchor -->
[See analysis details on SonarQube Cloud](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada merged PR #5136:
URL: https://github.com/apache/calcite/pull/5136
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "sonarqubecloud[bot] (via GitHub)" <gi...@apache.org>.
sonarqubecloud[bot] commented on PR #5136:
URL: https://github.com/apache/calcite/pull/5136#issuecomment-5207433360
## [](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136) **Quality Gate passed**
Issues
 [0 New issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=ACCEPTED)
Measures
 [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0.0% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_coverage&view=list)
 [0.0% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_duplicated_lines_density&view=list)
<!-- sqra-placement-anchor -->
[See analysis details on SonarQube Cloud](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada commented on code in PR #5136:
URL: https://github.com/apache/calcite/pull/5136#discussion_r3730286579
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
Review Comment:
You're right! I should've double checked that. It seems that 20 was an old cap, and nowadays is 2048 (i.e. virtually no limit for our purpose). I'll remove this check and warning.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada commented on PR #5136:
URL: https://github.com/apache/calcite/pull/5136#issuecomment-5241656557
Thanks for the review @xuzifu666 , @zabetak !
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada commented on code in PR #5136:
URL: https://github.com/apache/calcite/pull/5136#discussion_r3730333022
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
+ # the cap so a silently-truncated push shows up in the step summary
+ # rather than as "site branch is quietly missing commits."
+ if [ "$(echo "$COMMITS" | jq 'length')" -ge 20 ]; then
+ echo "::warning::Push contains 20+ commits — github.event.commits may be truncated; some commits may not be cherry-picked."
fi
+
+ # Extract each commit SHA from the push payload and iterate chronologically
+ echo "$COMMITS" | jq -r '.[].id' | while read -r commit_sha; do
+ echo "----------------------------------------"
+ echo "Cherry-picking commit: $commit_sha"
+ echo "----------------------------------------"
+
+ if ! git cherry-pick --strategy=recursive -X theirs "$commit_sha"; then
Review Comment:
My understanding is that in the old code, the "if" block was actually never reachable, because github [runs the command transparently](https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#exit-codes-and-error-action-preference) with `-e` , so if the cherry-pick failed, the action was aborted and the "if" was never reached.
IIANM, inserting the command directly on the "if" condition will achieve the intended purpose.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "sonarqubecloud[bot] (via GitHub)" <gi...@apache.org>.
sonarqubecloud[bot] commented on PR #5136:
URL: https://github.com/apache/calcite/pull/5136#issuecomment-5144626739
## [](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136) **Quality Gate passed**
Issues
 [0 New issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_calcite&pullRequest=5136&issueStatuses=ACCEPTED)
Measures
 [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_calcite&pullRequest=5136&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [0.0% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_coverage&view=list)
 [0.0% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_calcite&pullRequest=5136&metric=new_duplicated_lines_density&view=list)
<!-- sqra-placement-anchor -->
[See analysis details on SonarQube Cloud](https://sonarcloud.io/dashboard?id=apache_calcite&pullRequest=5136)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada commented on PR #5136:
URL: https://github.com/apache/calcite/pull/5136#issuecomment-5239039479
@zabetak I have tested the [patch on my fork](https://github.com/rubenada/calcite/actions/runs/31370838005/job/93399217460) and it seems to work fine: all commits are cherry-picked. I also tested a conflict scenario, and it worked fine too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "zabetak (via GitHub)" <gi...@apache.org>.
zabetak commented on code in PR #5136:
URL: https://github.com/apache/calcite/pull/5136#discussion_r3730035359
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
Review Comment:
Is there some documentation around the 20 entries limit? I was looking at https://docs.github.com/en/webhooks/webhook-events-and-payloads#push and there it says that commits array contains at most 2048 entries.
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
+ # the cap so a silently-truncated push shows up in the step summary
+ # rather than as "site branch is quietly missing commits."
+ if [ "$(echo "$COMMITS" | jq 'length')" -ge 20 ]; then
+ echo "::warning::Push contains 20+ commits — github.event.commits may be truncated; some commits may not be cherry-picked."
fi
+
+ # Extract each commit SHA from the push payload and iterate chronologically
+ echo "$COMMITS" | jq -r '.[].id' | while read -r commit_sha; do
+ echo "----------------------------------------"
+ echo "Cherry-picking commit: $commit_sha"
+ echo "----------------------------------------"
+
+ if ! git cherry-pick --strategy=recursive -X theirs "$commit_sha"; then
Review Comment:
The if condition is slightly different than before. Did you test the action with cherry-pick conflicts to ensure it works?
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
+ # the cap so a silently-truncated push shows up in the step summary
+ # rather than as "site branch is quietly missing commits."
+ if [ "$(echo "$COMMITS" | jq 'length')" -ge 20 ]; then
+ echo "::warning::Push contains 20+ commits — github.event.commits may be truncated; some commits may not be cherry-picked."
fi
Review Comment:
Do you have an example of how this looks?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [CALCITE-5584] Publish website action only triggers for the last commit in the chain [calcite]
Posted by "rubenada (via GitHub)" <gi...@apache.org>.
rubenada commented on code in PR #5136:
URL: https://github.com/apache/calcite/pull/5136#discussion_r3730289060
##########
.github/workflows/publish-non-release-website-updates.yml:
##########
@@ -35,15 +35,33 @@ jobs:
with:
fetch-depth: 0
ref: site
- - name: Cherry pick the commit to site
+ - name: Cherry pick all commits in push to site
+ env:
+ COMMITS: ${{ toJson(github.event.commits) }}
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
- if [ $? -neq 0 ]; then
- git status | sed -n 's/deleted by us://p' | xargs git add
- git cherry-pick --continue --no-edit
+
+ # github.event.commits is capped at 20 entries. Warn loudly if we hit
+ # the cap so a silently-truncated push shows up in the step summary
+ # rather than as "site branch is quietly missing commits."
+ if [ "$(echo "$COMMITS" | jq 'length')" -ge 20 ]; then
+ echo "::warning::Push contains 20+ commits — github.event.commits may be truncated; some commits may not be cherry-picked."
fi
Review Comment:
This block is actually unnecessary (see comment above), so it'll go away.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org