diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f8ad1b4d0f..85a553fc78 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,7 +2,7 @@ # Each line is a file pattern followed by one or more owners. # These owners will be the default owners for everything in the repo. -* @katebygrace @paulsbruce +* @don-code @anthonypburns # Order is important. The last matching pattern has the most precedence. # So if a pull request only touches javascript files, only these owners diff --git a/.github/workflows/netlify-pr-preview.yml b/.github/workflows/netlify-pr-preview.yml deleted file mode 100644 index b2cdbf6d33..0000000000 --- a/.github/workflows/netlify-pr-preview.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Development workflow - -on: - pull_request: - branches: - - '**' - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - # - name: Check out code - # uses: actions/checkout@v2 - - - name: Deploy to netlify - uses: netlify/actions/cli@master - env: - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - NETLIFY_SITE_ID: ${{ secrets.DEV_NETLIFY_SITE_ID }} - with: - args: deploy --dir=build --prod - secrets: '["NETLIFY_AUTH_TOKEN", "NETLIFY_SITE_ID"]' diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 2c9b4ef42e..0000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.3 diff --git a/Gemfile b/Gemfile index 5761cb3e0a..14b9c3e2c5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,4 @@ source "https://rubygems.org" -gem 'github-pages' + +gem "jekyll", "~> 3.7" +gem "kramdown-parser-gfm" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..3bfda3cb3e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,68 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + colorator (1.1.0) + concurrent-ruby (1.1.8) + em-websocket (0.5.2) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.14.2) + forwardable-extended (2.6.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.9.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (>= 1.17, < 3) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.4.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.3.6) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (4.0.6) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.4) + rouge (3.26.0) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + +PLATFORMS + ruby + x86_64-darwin-18 + +DEPENDENCIES + jekyll (~> 3.7) + kramdown-parser-gfm + +BUNDLED WITH + 2.2.11 + diff --git a/_config.yml b/_config.yml index bc42bf83b7..fb69417f9f 100755 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,6 @@ exclude: [CNAME, README.md, .gitignore] permalink: /:title ## disables post output timezone: null lsi: false -markdown: kramdown ### content configuration ### @@ -33,9 +32,3 @@ colors: purple: '#c869bf' orange: '#fab125' turquoise: '#0fbfcf' - -kramdown: - auto_ids: false - - -theme: jekyll-theme-midnight diff --git a/_includes/code-of-conduct.md b/_includes/code-of-conduct.md index 90e7afb806..4e358da5de 100644 --- a/_includes/code-of-conduct.md +++ b/_includes/code-of-conduct.md @@ -83,7 +83,7 @@ Direct messages sent to another user that are unsolicited, or unwelcome _at the ### Reporting If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact the admins. They'll respond as promptly as they can. -Our current admins are **@knach** and **@paulsbruce** +Our current admins are **Anthony Burns** and **Don Luchini**. We will respect confidentiality requests for the purpose of protecting victims of abuse. At our discretion, we may publicly name a person about whom we’ve received harassment complaints, or privately warn third parties about them. We will not name harassment victims without their affirmative consent. diff --git a/jekyllserver.sh b/jekyllserver.sh new file mode 100755 index 0000000000..5ecc17fc4c --- /dev/null +++ b/jekyllserver.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +if [ "$(uname)" == "Linux" ]; then + MOUNT_OPTION="Z" +else + MOUNT_OPTION="cached" +fi + +# You can set JEKYLL_IMAGE in the env to overwrite or it will default to this version +JEKYLL_IMAGE=${JEKYLL_IMAGE:-jekyll/jekyll:3} + +docker stop jekyll-server 2>/dev/null +docker rm jekyll-server 2>/dev/null + + +docker run -tip 4000:4000 -v $(pwd):/project:${MOUNT_OPTION} \ + -w /project \ + --name jekyll-server \ + ${JEKYLL_IMAGE} jekyll serve