diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
deleted file mode 100644
index 4f970d4..0000000
--- a/.github/workflows/ci-master.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-on:
- push:
- branches:
- - main
-
-name: main branch CI
-
-jobs:
- jekyll-latest:
- name: Build Jekyll site (latest)
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@main
-
- - name: Build the site in the jekyll/builder container
- run: |
- docker run --rm \
- --volume="${{ github.workspace }}:/srv/jekyll" \
- jekyll/builder:latest /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build && bundle exec rake search:init"
- jekyll-3-8-5:
- name: Build Jekyll site (v3.8.5)
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@main
-
- - name: Build the site in the jekyll/builder container
- run: |
- docker run --rm \
- --volume="${{ github.workspace }}:/srv/jekyll" \
- jekyll/builder:3.8.5 /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build && bundle exec rake search:init"
- assets:
- name: Format and test CSS and JS
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Use Node.js 12.x
- uses: actions/setup-node@v1
- with:
- node-version: "12.x"
- - run: npm install
- - run: npm test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fb7809..4eaa17d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,44 +1,42 @@
-on: [pull_request]
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - main
+ - 'v**'
name: CI
jobs:
-
- jekyll-latest:
- name: Build Jekyll site (latest)
+ jekyll-build:
+ name: Build Jekyll site
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ jekyll-version: [3.8.5, latest]
steps:
-
- - uses: actions/checkout@v2
-
- - name: Build the site in the jekyll/builder container
+ - uses: actions/checkout@v3
+ - name: Build the site in the jekyll/jekyll container
run: |
docker run --rm \
--volume="${{ github.workspace }}:/srv/jekyll" \
- jekyll/builder:latest /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build && bundle exec rake search:init"
-
- jekyll-3-8-5:
- name: Build Jekyll site (v3.8.5)
- runs-on: ubuntu-latest
- steps:
-
- - uses: actions/checkout@v2
-
- - name: Build the site in the jekyll/builder container
- run: |
- docker run --rm \
- --volume="${{ github.workspace }}:/srv/jekyll" \
- jekyll/builder:3.8.5 /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build && bundle exec rake search:init"
+ jekyll/jekyll:${{ matrix.jekyll-version }} /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build && bundle exec rake search:init"
assets:
name: Test CSS and JS
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ node-version: [16.x]
+
steps:
- - uses: actions/checkout@v2
- - name: Use Node.js 12.x
+ - uses: actions/checkout@v3
+ - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
- node-version: '12.x'
+ node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
diff --git a/Dockerfile b/Dockerfile
index 5f0ddae..a499513 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:2.7
ENV LC_ALL C.UTF-8
ENV LANG en_US.UTF-8
@@ -10,4 +10,3 @@ COPY Gemfile just-the-docs.gemspec ./
RUN gem install bundler && bundle install
EXPOSE 4000
-
diff --git a/README.md b/README.md
index 30665ab..43775d1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
- 
+ 