You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2021/12/27 06:40:04 UTC
[GitHub] [camel-website] djencks opened a new pull request #741: Resolves issue #733: modifications to publish to separate git repo
djencks opened a new pull request #741:
URL: https://github.com/apache/camel-website/pull/741
I think these "code" changes are what's needed to publish to a separate repo `camel-website-pub.git`.
See issue for additional steps.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799720561
##########
File path: static/.asf.yaml
##########
@@ -0,0 +1,34 @@
+#
Review comment:
On this I disagree with you. If we keep it here, publishing consists of removing _everything_ from the site-pub repo, adding the entire site, and committing. If we keep it in the `camel-website-pub` repo then we have to make an exception for one file. I think that is excessively complex for no gain.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart merged pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart merged pull request #741:
URL: https://github.com/apache/camel-website/pull/741
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r800490804
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
+ jira_options: link label=
publish:
whoami: asf-site
Review comment:
This is read by the tools used to publish the website, see [chapter 5. Publishing](https://infra.apache.org/project-site.html), and might end up causing issues when publishing.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r801412882
##########
File path: static/.asf.yaml
##########
@@ -0,0 +1,34 @@
+#
Review comment:
Oh, that's actually quite clever, I missed that, apologies :+1:
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799719201
##########
File path: Jenkinsfile
##########
@@ -94,7 +94,7 @@ pipeline {
steps {
dir('deploy/live') {
deleteDir()
- sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
+ sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website-pub.git .'
sh "git -c core.editor='sed -i 2,/\$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/' rebase -q --interactive $STOP_SQUASH_AT" // squash all but initial and last 9 commits
Review comment:
I don't think we can do that until the asf-site branch is moved to the new repo and we determine if the OID is the same.... I think it should be, but I'm not sure.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on pull request #741:
URL: https://github.com/apache/camel-website/pull/741#issuecomment-1031286971
> I believe I'm no longer a PMC member so someone else will have to create the repository, if we proceed with this.
I've created the repository (https://gitbox.apache.org/repos/asf?p=camel-website-pub.git, https://github.com/apache/camel-website-pub)
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r800490999
##########
File path: Jenkinsfile
##########
@@ -94,7 +94,7 @@ pipeline {
steps {
dir('deploy/live') {
deleteDir()
- sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
+ sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website-pub.git .'
sh "git -c core.editor='sed -i 2,/\$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/' rebase -q --interactive $STOP_SQUASH_AT" // squash all but initial and last 9 commits
Review comment:
The squashing was introduced in/about July 2020 after Netlify previews stopped building due to a timeout when checking out the git repository. The issue came down to the size of the repository which was increasing and at that point reached 3.1GB. We no longer run the builds on Netlify but push the resulting site built in GitHub Actions. In spite of this to keep the ergonomics of contributing to the website we kept squashing to try to keep a cap on the repository size. If we were to push the `asf-site` branch to a different repository we can stop doing the squashing.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r794372568
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
Review comment:
Looks like a typo
##########
File path: static/.asf.yaml
##########
@@ -0,0 +1,34 @@
+#
Review comment:
We should keep this file in `camel-website-pub` repository
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
+ jira_options: link label=
publish:
whoami: asf-site
Review comment:
This needs to be removed if we're not publishing from the `asf-site` branch
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
+ jira_options: link label=
publish:
whoami: asf-site
-github:
- labels:
- - camel
- - integration
- - java
- - hacktoberfest
- enabled_merge_buttons:
- squash: true
- merge: false
- rebase: true
- features:
- issues: true
Review comment:
This has little to do with publishing the website, accidentally removed?
##########
File path: Jenkinsfile
##########
@@ -94,7 +94,7 @@ pipeline {
steps {
dir('deploy/live') {
deleteDir()
- sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
+ sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website-pub.git .'
sh "git -c core.editor='sed -i 2,/\$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/' rebase -q --interactive $STOP_SQUASH_AT" // squash all but initial and last 9 commits
Review comment:
`STOP_SQUASH_AT` needs to be updated
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r801188583
##########
File path: static/.asf.yaml
##########
@@ -0,0 +1,34 @@
+#
Review comment:
If we keep it in static/.asf.yaml, it will be placed in the correct branch in camel-website-pub with every commit. I set up the Aries and Felix websites this way and they seem to work fine.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] github-actions[bot] commented on pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #741:
URL: https://github.com/apache/camel-website/pull/741#issuecomment-1030316784
🚀 Preview is available at https://pr-741--camel.netlify.app
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799988391
##########
File path: Jenkinsfile
##########
@@ -94,7 +94,7 @@ pipeline {
steps {
dir('deploy/live') {
deleteDir()
- sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
+ sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website-pub.git .'
sh "git -c core.editor='sed -i 2,/\$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/' rebase -q --interactive $STOP_SQUASH_AT" // squash all but initial and last 9 commits
Review comment:
I also think we should stop squashing, and just keep all the history. It doesn't slow down our website deploy, in fact it should be marginally quicker as no squash is needed. If we tag the site just before we remove an outdated subproject version, we can point then people to the old documentation rather easily.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on pull request #741:
URL: https://github.com/apache/camel-website/pull/741#issuecomment-1032112891
Thanks for creating the repo! How shall we proceed?
I think we need to:
- create an asf-site branch in the new repo with at least one commit. I guess we can push the asf-site branch from camel-website to the new repo.
- merge this PR
- see what happens with the Jenkins build.
I'm happy to do this or have you do it. My guess is that you know more about backing stuff out if there are problems.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r800492808
##########
File path: static/.asf.yaml
##########
@@ -0,0 +1,34 @@
+#
Review comment:
As far as I understand the [documentation](https://infra.apache.org/project-site.html) on publishing the website, the built website from camel-website-pub repository will not be published without it. This is a requirement for publishing the website that the git repository with the website content contains `.asf.yaml` file.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799718306
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
+ jira_options: link label=
publish:
whoami: asf-site
-github:
- labels:
- - camel
- - integration
- - java
- - hacktoberfest
- enabled_merge_buttons:
- squash: true
- merge: false
- rebase: true
- features:
- issues: true
Review comment:
yes.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on pull request #741:
URL: https://github.com/apache/camel-website/pull/741#issuecomment-1030256740
I believe I'm no longer a PMC member so someone else will have to create the repository, if we proceed with this.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799718168
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
+ jira_options: link label=
publish:
whoami: asf-site
Review comment:
Well, I agree it should be, but if there's no longer an asf-site branch in this repo it's just confusing rather than an error:-)
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] djencks commented on a change in pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
djencks commented on a change in pull request #741:
URL: https://github.com/apache/camel-website/pull/741#discussion_r799717517
##########
File path: .asf.yaml
##########
@@ -17,18 +17,6 @@
notifications:
pullrequests: commits@camel.apache.org
- jira_options: link label comment
Review comment:
agreed.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-website] zregvart commented on pull request #741: Resolves issue #733: modifications to publish to separate git repo
Posted by GitBox <gi...@apache.org>.
zregvart commented on pull request #741:
URL: https://github.com/apache/camel-website/pull/741#issuecomment-1032384798
> Thanks for creating the repo! How shall we proceed?
>
> I think we need to:
>
> * create an asf-site branch in the new repo with at least one commit. I guess we can push the asf-site branch from camel-website to the new repo.
>
> * merge this PR
>
> * see what happens with the Jenkins build.
I think we can try something like that, perhaps merge this first. I wonder what will happen if we have two asf-site branches, I guess if there would be any disruption it won't take too long.
Nonetheless, I'll put out an email and notify folk on Zulip so they aren't surprised if the website is unavailable for a bit.
I'll keep a copy of everything so we can backtrack if needed.
--
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@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org