Add GitHub action to build and push the site when changed on master

Author: Jason Young

.github/workflows/site.yml

@@ -0,0 +1,70 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Build and Deploy Jekyll Site
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - site/**
+
+permissions:
+  contents: write
+
+jobs:
+  build-site:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.2.5'
+        
+    - name: Set up Node.js
+      uses: actions/setup-node@v2
+      with:
+        # TODO: Lock done a specifc version for node and ruby and define
+        # it in single place to be shared by this action and /site/Dockerfile
+        node-version: '20'
+
+    - name: Run build script
+      run: |
+        cd site/
+        chmod +x ./build.sh
+        ./build.sh
+
+    - name: Remove non-site files
+      run: |
+        cp -r site/_site/ /tmp/
+        rm -rf *
+        cp -r /tmp/_site/* .
+
+    - name: Commit and push to asf-site branch
+      run: |
+        git config user.name "GitHub Actions Bot"
+        git config user.email "<>"
+        git checkout asf-site
+        git commit -m "Automatic Site Publish by Buildbot"
+        git push
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -10,3 +10,5 @@ node_modules/
 .npm
 npm-debug.log
 *.DS_store
+./site/_site
+.jekyll-cache

site/Dockerfile

@@ -9,21 +9,22 @@ COPY Gemfile* /tmp/
 WORKDIR /tmp
 RUN bundle install
 
-ENV app=/app
-
 # Install npm modules
 COPY package.json /tmp/
 WORKDIR /tmp
 RUN npm install -g
 
-# Add src code
-RUN mkdir $app
-WORKDIR $app
-ADD . $app
+# Add src code and build script
+RUN mkdir /app
+WORKDIR /app
+COPY . /app
+
+# Make the build script executable
+RUN chmod +x /app/build.sh
 
-# Jekyll buld
-RUN bundle exec jekyll build
+# Run the build script
+RUN /app/build.sh
 
-WORKDIR $app/_site
+WORKDIR /app/_site
 
-EXPOSE 8000
+EXPOSE 8000

site/Gemfile.lock

@@ -72,7 +72,7 @@ DEPENDENCIES
   jekyll-feed (~> 0.17.0)
 
 RUBY VERSION
-   ruby 2.6.10p210
+   ruby 3.2.3p157
 
 BUNDLED WITH
    2.4.22

site/README.md

@@ -10,13 +10,3 @@ How to Build and Deploy Site
     ```
     docker run -p 8000:8000 -it flagon:site python -m http.server
     ```
-4. (Optional): To update the site, can copy the files from the container to `_site`.
-    ```
-    # First grab container id
-    CID=$(docker create -p 8000:8000 -it flagon:site python -m http.server)
-    # Reference container id to grab built contents
-    docker cp $CID:/app/_site .
-    ```
-    Then copy files from `_site` in `/site` folder into `/contents` folder.
-    
-    Merge new website mods at **master** branch with **asf-site** branch to push changes live.