Update Jekyll setup and configuration

SaillantNicolas · Apr 26, 2024 · 76f236b · 76f236b
1 parent 1038e65
commit 76f236b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/.github/workflows/Deploy_web_site_with_ssh.yml b/.github/workflows/Deploy_web_site_with_ssh.yml
@@ -12,17 +12,26 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Change BASE_PATH
-        run: yq -i '.JB.BASE_PATH = "${{ vars.CGAL_WEB_SITE_URL }}"' _config.yml
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Setup Jekyll
+        run: |
+          gem install jekyll bundler
+      - name: Update Configuration
+        run: |
+          yq -i '.JB.BASE_PATH = ""' _config.yml
+          yq -i '.baseurl = "${{ vars.CGAL_WEB_SITE_URL }}"' _config.yml
+          yq -i '.JB.ASSET_PATH = "${{ vars.CGAL_WEB_SITE_URL }}/assets/themes/cgal/"' _config.yml
+      - run: cat _config.yml
       - name: Remove demo/ (temporarily)
         run: rm -rf demo/
       - name: setup nodejs
         run: npm install
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./
-          destination: ./_site
+      - name: Build with jekyll
+        run: jekyll build --destination ./_site
       - name: install ssh keys
         run: |
           install -m 600 -D /dev/null ~/.ssh/id_rsa
@@ -31,4 +40,4 @@ jobs:
       - name: rsync
         run: rsync -avz ./_site/ ${{ secrets.CGAL_WEB_SFTP_USERNAME }}@${{ vars.CGAL_WEB_SFTP_HOST }}:${{ vars.CGAL_WEB_SFTP_DESTDIR }}
       - name: cleanup
-        run: rm -rf ~/.ssh
+        run: rm -rf ~/.ssh
diff --git a/.github/workflows/Receive_PR.yml b/.github/workflows/Receive_PR.yml
@@ -11,19 +11,27 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Change BASE_PATH
-        run: yq -i '.JB.BASE_PATH = "https://cgal.github.io/cgal-web"' _config.yml
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Setup Jekyll
+        run: |
+          gem install jekyll bundler
+      - name: Update Configuration
+        run: |
+          yq -i '.JB.BASE_PATH = ""' _config.yml
+          yq -i '.baseurl = "https://cgal.github.io/cgal-web"' _config.yml
+          yq -i '.JB.ASSET_PATH = "https://cgal.github.io/cgal-web/assets/themes/cgal/"' _config.yml
       - name: Remove demo/ (temporarily)
         run: rm -rf demo/
-      - name: setup nodejs
-        run: npm install
       - name: Setup Pages
         uses: actions/configure-pages@v5
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./
-          destination: ./_site
+      - name: setup nodejs
+        run: npm install
+      - name: Build with jekyll
+        run: jekyll build --destination ./_site
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
       - name: Create PR number file
@@ -33,4 +41,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: pr_number
-          path: pr_number.txt
+          path: pr_number.txt