Merge pull request eclipse-xtext#11 from eclipse/cd_issue2706

Adapt to Foundation website changes

Jenkinsfile

@@ -50,12 +50,12 @@ spec:
               git clone -b master [email protected]:eclipse/xtext-website-publish.git deploy-xtext-git-repo
             '''
           }
-          sshagent(['git.eclipse.org-bot-ssh']) { // 
-            sh '''
-              rm -rf deploy-xtend-git-repo
-              git clone -b master ssh://[email protected]:29418/www.eclipse.org/xtend deploy-xtend-git-repo
-            '''
-          }
+          // sshagent(['git.eclipse.org-bot-ssh']) { // 
+          //   sh '''
+          //     rm -rf deploy-xtend-git-repo
+          //     git clone -b master ssh://[email protected]:29418/www.eclipse.org/xtend deploy-xtend-git-repo
+          //   '''
+          // }
       }
     }
     stage('Generate site') {
@@ -71,7 +71,7 @@ spec:
         dir ('git-repo/xtend-website') {
           sh '''
             # generate things in _site
-            bundle exec jekyll build
+            bundle exec jekyll build --destination ../xtext-website/_site/xtend
           '''
         }
         }
@@ -89,16 +89,16 @@ spec:
             git status
           '''
         }
-        dir ('deploy-xtend-git-repo') {
-          sh '''
-            git config user.name "genie-xtext"
-            git config user.email "[email protected]"
-            cp -r $WORKSPACE/git-repo/xtend-website/_site/* .
-            git diff
-            git add --all :/ && git commit -m "Generated from commit: https://github.com/eclipse/xtext/commit/$GIT_COMMIT"
-            git status
-          '''
-        }
+        // dir ('deploy-xtend-git-repo') {
+        //   sh '''
+        //     git config user.name "genie-xtext"
+        //     git config user.email "[email protected]"
+        //     cp -r $WORKSPACE/git-repo/xtend-website/_site/* .
+        //     git diff
+        //     git add --all :/ && git commit -m "Generated from commit: https://github.com/eclipse/xtext/commit/$GIT_COMMIT"
+        //     git status
+        //   '''
+        // }
       }
     }
     stage('Deploy') {
@@ -111,13 +111,13 @@ spec:
             '''
           }
         }
-        dir ('deploy-xtend-git-repo') {
-          sshagent(['git.eclipse.org-bot-ssh']) { // 
-            sh '''
-              git push origin master
-            '''
-          }
-        }
+        // dir ('deploy-xtend-git-repo') {
+        //   sshagent(['git.eclipse.org-bot-ssh']) { // 
+        //     sh '''
+        //       git push origin master
+        //     '''
+        //   }
+        // }
       }
     }
   }

xtend-website/_config.yml

@@ -6,8 +6,8 @@ description: > # this means to ignore newlines until "baseurl:"
   Java 5 compatible source code. You can use any existing Java library seamlessly.
   The compiled output is readable and pretty-printed, and tends to run as fast as
   the equivalent handwritten Java code.
-baseurl: "/xtend" # the subpath of your site, e.g. /blog/
-url: "http://xtend-lang.org" # the base hostname & protocol for your site
+baseurl: "/Xtext/xtend" # the subpath of your site, e.g. /blog/
+url: "https://eclipse.dev" # the base hostname & protocol for your site
 twitter_username: xtendlang
 github_username:  xtext
 encoding: UTF-8
@@ -39,7 +39,7 @@ src:
   xtext: "https://github.com/eclipse/xtext/tree/main"
 
 javadoc:
-  java: "http://docs.oracle.com/javase/11/docs/api"
+  java: "https://docs.oracle.com/javase/11/docs/api"
   guava: "https://guava.dev/releases/30.1-jre/api/docs/"
 
 edit-repo : "https://github.com/eclipse/xtext-website/tree/main/xtend-website/"

xtext-website/_config.yml

@@ -7,7 +7,7 @@ description: > # this means to ignore newlines until "baseurl:"
   top-notch Eclipse IDE integration. It comes with great defaults for all these aspects which at the same time can 
   be easily tailored to your individual needs.
 baseurl: "/Xtext" # the subpath of your site, e.g. /blog/
-url: "http://xtext.org" # the base hostname & protocol for your site
+url: "https://eclipse.dev" # the base hostname & protocol for your site
 twitter_username: xtext
 github_username:  xtext-dev
 encoding: UTF-8
@@ -41,11 +41,11 @@ src:
   emf: "https://git.eclipse.org/r/plugins/gitiles/emf/org.eclipse.emf/+/refs/tags/R2_20_0"
 
 javadoc:
-  eclipse-platform: "http://help.eclipse.org/luna/topic/org.eclipse.platform.doc.isv/reference/api"
-  eclipse-jdt: "http://help.eclipse.org/luna/topic/org.eclipse.jdt.doc.isv/reference/api"
-  java: "http://docs.oracle.com/javase/8/docs/api"
+  eclipse-platform: "https://help.eclipse.org/luna/topic/org.eclipse.platform.doc.isv/reference/api"
+  eclipse-jdt: "https://help.eclipse.org/luna/topic/org.eclipse.jdt.doc.isv/reference/api"
+  java: "https://docs.oracle.com/javase/8/docs/api"
   javaee: "https://docs.oracle.com/javaee/7/api"
-  junit: "http://junit.sourceforge.net/javadoc"
+  junit: "https://junit.sourceforge.net/javadoc"
   guice: "https://google.github.io/guice/api-docs/latest/javadoc"
 
 edit-repo : "https://github.com/eclipse/xtext-website/edit/published/xtext-website/"