ty remove domain from build source

Author: mfleisch

.github/workflows/deploy-main.yaml

@@ -3,26 +3,28 @@ name: Build and Deploy Main Branch
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
 
 permissions:
   pages: write
   id-token: write
 
 jobs:
-  # Call the reusable build workflow
-  build:
-    uses: ./.github/workflows/reusable-build.yaml
-
-  # The deploy job stays the same, as it depends on the output of the build job
+  # This job gets the environment URL and triggers the build
   deploy:
-    needs: build
     runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
+
+  # This job is now triggered by the deploy job
+  build:
+    needs: deploy
+    uses: ./.github/workflows/reusable-build.yaml
+    with:
+      # Pass the final deployment URL to the build
+      url: ${{ needs.deploy.outputs.page_url }}

.github/workflows/deploy-pr.yaml

@@ -1,11 +1,7 @@
-# deploy-pr.yaml
-name: Build and Deploy PR Preview
-
 on:
   pull_request:
     types: [opened, synchronize]
-    branches:
-      - main
+    branches: [main]
 
 permissions:
   pages: write
@@ -15,7 +11,6 @@ jobs:
   build:
     uses: ./.github/workflows/reusable-build.yaml
     with:
-      # Pass the repository name as the baseurl for previews
       baseurl: "/sirius-docs.github.io"
 
   deploy:

.github/workflows/reusable-build.yaml

@@ -3,12 +3,15 @@ name: Reusable Jekyll Build
 
 on:
   workflow_call:
-    # Define an optional input for the baseurl
     inputs:
       baseurl:
         required: false
         type: string
         default: '""'
+      url:
+        required: false
+        type: string
+        default: '""'
 
 jobs:
   build:
@@ -25,10 +28,10 @@ jobs:
 
       - name: Build Jekyll Site
         working-directory: ./docs
-        env:
-          JEKYLL_ENV: production
-        # Use the input to set the baseurl, otherwise it's an empty string
-        run: bundle exec jekyll build --baseurl "${{ inputs.baseurl }}"
+        run: >
+          bundle exec jekyll build
+          --baseurl "${{ inputs.baseurl }}"
+          --config "_config.yml,url:${{ inputs.url }}"
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

docs/_config.yml

@@ -21,7 +21,6 @@ title_separator          : "-"
 subtitle                 : "Official online documentation for the SIRIUS MS/MS Software" # site tagline that appears below site title in masthead
 name                     : "SIRIUS Software Project"
 description              : "Official online documentation for the SIRIUS MS/MS Software"
-url                      : "https://v6.docs.sirius-ms.io/" # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
 baseurl                  : "/" # the subpath of your site, e.g. "/blog"
 repository               : "sirius-ms/sirius-docs.github.io" # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
 teaser                   : "/assets/images/sirius.png"# path of fallback teaser image, e.g. "/assets/images/500x300.png"