infra: Do not copy files into image

The content is mounted at runtime.

Signed-off-by: Alex Apostolescu <[email protected]>

Author: Alex-deVis

.github/workflows/deployment.yml

@@ -4,32 +4,61 @@ on:
   push:
     branches:
       - main
+      - ci/jekyll  # TODO: Remove before merging to main
 
 jobs:
   deploy:
     name: Deploy to GitHub Pages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout the current branch to a `main` directory
+        uses: actions/checkout@v4
+        with:
+          path: main
+
+      - name: Checkout `x86_64` branch
+        uses: actions/checkout@v4
+        with:
+          ref: x86_64
+          path: x86_64
+      
+      - name: Build Docker image for Jekyll
+        run: |
+          docker build -t jekyll-image .
+        working-directory: main
 
-      - name: Build Jekyll site
+      - name: Build Jekyll site for x86
         run: |
-          # GitHub-specific config
           echo "url: https://${{ github.repository_owner }}.github.io" >> _config.yaml
           echo "baseurl: /hardware-software-interface" >> _config.yaml
 
-          # Build Docker image for Jekyll
-          docker build -t jekyll-image .
+          # Build Jekyll site for x86
+          docker run --rm \
+            -v $(pwd):/base/app \
+            -u $(id -u):$(id -g) \
+            jekyll-image bundle exec jekyll build -s /base/app -d /base/app/_site
+        working-directory: main
 
-          # Build Jekyll site
+      - name: Build Jekyll site for x64
+        run: |
+          echo "url: https://${{ github.repository_owner }}.github.io" >> _config.yaml
+          echo "baseurl: /hardware-software-interface/x86_64" >> _config.yaml
+
+          # Build Jekyll site for x86_64
+          # Note: The x86_64 site is built in a separate directory.
           docker run --rm \
-            -v ${{ github.workspace }}:/usr/src/app \
-            jekyll-image bundle exec jekyll build
+            -v $(pwd):/base/app \
+            -u $(id -u):$(id -g) \
+            jekyll-image bundle exec jekyll build -s /base/app -d /base/app/_site
+
+          # Move the x86_64 site under the main site directory
+          mv _site ${{ github.workspace }}/main/_site/x86_64
+        working-directory: x86_64
 
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: _site
+          publish_dir: main/_site
           publish_branch: gh-pages
           enable_jekyll: true

.github/workflows/pr-deployment.yml

@@ -40,8 +40,9 @@ jobs:
 
           # Build Jekyll site
           docker run --rm \
-            -v ${{ github.workspace }}:/usr/src/app/ \
-            jekyll-site bundle exec jekyll build
+            -v $(pwd):/base/app \
+            -u $(id -u):$(id -g) \
+            jekyll-image bundle exec jekyll build -s /base/app -d /base/app/_site
 
       # The PR site is deployed as a subdirectory of the main site.
       # This means that it will be overwritten when the main site is redeployed.

.gitignore

@@ -68,4 +68,3 @@ _site/
 # Ignore folders generated by Bundler
 .bundle/
 vendor/
-*.lock

Dockerfile

@@ -1,16 +1,17 @@
-FROM ruby:3.0-slim
+FROM ruby:3.4.4-slim
 
 RUN apt-get update && apt-get install -y \
+    git \
     build-essential \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /usr/src/app
+WORKDIR /base
 
-COPY Gemfile ./
-RUN gem install bundler
-RUN bundle install
+COPY Gemfile Gemfile.lock /base/
+RUN gem install bundler:2.6.9 && bundle install
 
 EXPOSE 4000
 
-CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
+# Expect the Jekyll source to be in /base/app
+CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0", "-s", "/base/app" ,"-d", "/base/app/_site"]