Skip to content

INFRA-27679 - Avoid squash to avoid new very large commit on each new#1573

Merged
apupier merged 1 commit into
apache:mainfrom
apupier:INFRA-27679-attemptToAvoid404ByAvoidingSquashCreatingANewVeryLargeCommits
Apr 16, 2026
Merged

INFRA-27679 - Avoid squash to avoid new very large commit on each new#1573
apupier merged 1 commit into
apache:mainfrom
apupier:INFRA-27679-attemptToAvoid404ByAvoidingSquashCreatingANewVeryLargeCommits

Conversation

@apupier
Copy link
Copy Markdown
Contributor

@apupier apupier commented Apr 15, 2026

website build

the newly created very large commit created on each push might be the cause of the 404 as the CDN might have problems to handle it right away. Based on https://issues.apache.org/jira/browse/INFRA-27679?focusedCommentId=18062765&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-18062765

It means that the history will grow. So we might need to ensure that the checkout of this site is either done with a depth of 1 or if already available and just a pull is done maybe to squash one time manually from time to time.
see https://issues.apache.org/jira/browse/INFRA-27679?focusedCommentId=18073130&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-18073130

Comment thread Jenkinsfile
sh 'git rm -q -r *'
sh "cp -R $WORKSPACE/camel-website/public/. ."
sh 'git add .'
sh "git checkout $STOP_SQUASH_AT -- ./.asf.yaml" // force revert to commit containing the valid .asf.yml
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to check the content of the .asf.yaml which will be provided then, maybe will need to change something how the .asf.yaml is genrated or to continue to checkout one from a specific revision.
I'm wondering if the problem is not that we wan a different .asf.yaml between camel-website repo and camel-website-pub

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gansheer as you introduced the line for that, maybe you can provide a bit more context?

Copy link
Copy Markdown
Contributor

@gansheer gansheer Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only modified that line but yes there is context: #1410 (comment). From what I remember we squash every commit to avoid the repo to grow too much (I would say in storage and history). But since we want to keep the .asf.yaml file from the camel-website-pub repo (and not the one from the camel-website repo) we retrieve the valid version from a defined commit we decided contained the right version.

I think with your change we will end with camel-website .asf.yml file inside camel-website-pub so it probably won't work well.

camel-website: https://github.com/apache/camel-website/blob/main/.asf.yaml
camel-website-pub: https://github.com/apache/camel-website-pub/blob/asf-site/.asf.yaml

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, so I changed the PR to keep the .asf.yaml from the camel-website-pub

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Preview is available at https://pr-1573--camel.netlify.app

@davsclaus
Copy link
Copy Markdown
Contributor

@zregvart ^^^ in case you want to take a quick look

Copy link
Copy Markdown
Member

@zregvart zregvart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's give it a shot, I don't think there is much that this can break if anything. Also easy to revert if it ends up not helping.

Thanks @apupier

website build

the newly created very large commit created on each push might be the
cause of the 404 as the CDN might have problems to handle it right away.
Based on https://issues.apache.org/jira/browse/INFRA-27679?focusedCommentId=18062765&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-18062765

It means that the history will grow. So we might need to ensure that the
checkout of this site is either done with a depth of 1 or if already
available and just a pull is done maybe to squash one time manually from
time to time.
see https://issues.apache.org/jira/browse/INFRA-27679?focusedCommentId=18073130&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-18073130

Signed-off-by: Aurélien Pupier <apupier@ibm.com>
@apupier apupier force-pushed the INFRA-27679-attemptToAvoid404ByAvoidingSquashCreatingANewVeryLargeCommits branch from 576a825 to 67d9e23 Compare April 16, 2026 07:18
@apupier apupier marked this pull request as ready for review April 16, 2026 07:34
@github-actions
Copy link
Copy Markdown
Contributor

🚀 Preview is available at https://pr-1573--camel.netlify.app

@apupier apupier merged commit 40617dc into apache:main Apr 16, 2026
1 check passed
@apupier apupier deleted the INFRA-27679-attemptToAvoid404ByAvoidingSquashCreatingANewVeryLargeCommits branch April 16, 2026 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants