Merge branch 'master' into coc

.github/workflows/ci-build.yaml

@@ -1,39 +1,53 @@
-name: CI build 
+name: CI build
 on:
-  # push:
-  #   branches:
-  #     - master
   pull_request:
     branches:
       - master
+  workflow_dispatch:
+
 jobs:
-  checklinks:
+  build:
     name: Linux
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
+    env:
+      # Control the use of htmlproofer. Set to '1' to enable htmlproofer.
+      USE_HTMLPROOFER: '0'
     steps:
-      - uses: actions/checkout@v2
-      - name: Ruby
-        uses: actions/setup-ruby@v1
+      # Clone the repository and checkout into the relevant branch
+      - uses: actions/[email protected]
+
+      # Install Ruby
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
-      - name: Setup Rubygems, Bundler, jekyll
-        run: | 
+          ruby-version: 2.7.3 # Check https://pages.github.com/versions/ for the current Ruby version used by gh pages.
+
+      # Install dependencies required to run jekyll build
+      - name: Install gh-pages rubygem via bundler
+        run: |
+          # Update gem and bundler
           gem update --system --no-document
           gem update bundler --no-document
-          gem install jekyll bundler
+          # Set the bundle directory
           bundle config set path vendor/bundle
+          # Install Gemfile contents via bundler
           bundle install
+
+      # Build the website via jekyll
       - name: Build jekyll website with drafts
         run: bundle exec jekyll build --drafts
-      # - name: Check for broken links
-      #   run: |
-      #     bundle exec htmlproofer --disable-external --allow-hash-href --internal-domains=rse.shef.ac.uk,rse.sheffield.ac.uk --log-level :debug ./_site &> links.log
-      #   continue-on-error: true
-      # - name: Archive log links
-      #   uses: actions/upload-artifact@v1
-      #   with:
-      #     name: links-check.log
-      #     path: links.log
 
+      # Check for broken links if enabled
+      - name: Check for broken links
+        if: ${{ env.USE_HTMLPROOFER == '1' }}
+        run: |
+          bundle exec htmlproofer --disable-external --allow-hash-href --internal-domains=rse.shef.ac.uk,rse.sheffield.ac.uk --log-level :debug ./_site &> links.log
+        continue-on-error: true
+
+      # Store the list of potentially broken links
+      - name: Archive log links
+        if: ${{ env.USE_HTMLPROOFER == '1' }}
+        uses: actions/upload-artifact@v1
+        with:
+          name: links-check.log
+          path: links.log

.github/workflows/pa11y.yaml

@@ -0,0 +1,43 @@
+name: pa11y tests
+
+on:
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Building site and running pa11y-ci tests
+    runs-on: ubuntu-latest
+
+    steps:
+      # Clone the repository and checkout into the relevant branch
+      - uses: actions/[email protected]
+
+      # Install Ruby
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.3 # Check https://pages.github.com/versions/ for the current Ruby version used by gh pages.
+
+      # Install dependencies required to run jekyll build
+      - name: Install gh-pages rubygem via bundler
+        run: |
+          # Update gem and bundler
+          gem update --system --no-document
+          gem update bundler --no-document
+          # Set the bundle directory
+          bundle config set path vendor/bundle
+          # Install Gemfile contents via bundler
+          bundle install
+
+      # Install pa11y requirements
+      - name: Install pa11y-ci
+        run: npm install -g pa11y-ci
+
+      # Check site accesibility
+      - name: Serve site and test with pa11y
+        run: |
+          bundle exec jekyll serve --detach
+          pa11y-ci http://localhost:4000/

.gitignore

@@ -14,6 +14,9 @@ vendor/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+# jetbrains
+.idea/
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -84,4 +87,8 @@ fabric.properties
 RSE-Sheffield.github.io.Rproj
 .Rhistory
 
+# vscode
+.vscode/
 
+# Emacs
+*~

Gemfile

@@ -21,6 +21,7 @@ gem "github-pages", group: :jekyll_plugins
 # If you have any plugins, put them here!
 group :jekyll_plugins do
    gem "jekyll-feed", "~> 0.6"
+   gem "jekyll-paginate"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -31,3 +32,8 @@ gem "html-proofer"
 
 # For redirects
 gem "jekyll-redirect-from"
+
+# Emojis https://github.com/jekyll/jemoji
+gem "jemoji"
+
+gem "webrick", "~> 1.7"