Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies, including pa11y-ci to 3 from 2 #106

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
05bab88
Build PR tip regardless of PR target
danyalaytekin Oct 3, 2023
6e1595d
For Makefile's simplicity, remove per-line suppression of command ech…
danyalaytekin Oct 4, 2023
7f5daa6
Remove repetition of Makefile tasks' purposes
danyalaytekin Oct 4, 2023
431f7df
Ignore .tool-versions
danyalaytekin Oct 4, 2023
6ec34cc
Recommend extension 'github.vscode-github-actions'
danyalaytekin Oct 4, 2023
f0c540f
Update Ruby to 2's final version, 2.7.8, from 2.6.3
danyalaytekin Oct 4, 2023
2cf9eea
Update gem 'github-pages' to 228 from 209
danyalaytekin Oct 4, 2023
c17cf67
Use Node 18 and valid package.json
danyalaytekin Oct 9, 2023
3644ba2
Add build job
danyalaytekin Oct 9, 2023
e7be9fb
Upgrade Ruby usage to 3.2.2 from EOL 2.7.8
danyalaytekin Oct 9, 2023
339fd3a
Move badge uris into footnotes as with our other repos
danyalaytekin Nov 10, 2023
e2b3ef6
Upgrade to `pa11y-ci@3` from `2`
danyalaytekin Nov 10, 2023
99ca961
Return to Node 14 from 18 since we're still on `pa11y-ci@3`
danyalaytekin Nov 10, 2023
87fba16
Drop to concurrency 1 to fix `pa11y-ci@3` issue
danyalaytekin Nov 10, 2023
576fb49
Pre-emptively fix IPV6 issue in Node 18
danyalaytekin Nov 10, 2023
b608202
Describe a way to set up with Ruby and Node locally
danyalaytekin Nov 10, 2023
163daf3
Set `package.license` to `CC-BY-NC` to match `README`
danyalaytekin Nov 10, 2023
9e0fcc1
Revert "Pre-emptively fix IPV6 issue in Node 18"
danyalaytekin Nov 10, 2023
115864a
Describe how to test `build` job locally
danyalaytekin Nov 10, 2023
f32b63c
Update Markdown gremlins
danyalaytekin Nov 12, 2023
db0d722
Update lockfile for minor, patch
danyalaytekin Nov 12, 2023
7fa13b5
Update `package.license` in lockfile
danyalaytekin Nov 12, 2023
784bc42
Add our `.editorconfig`
danyalaytekin Nov 12, 2023
1ae6814
Restore the wise suppression of echo echo
danyalaytekin Nov 12, 2023
9345f69
Add command `make browse` (`jekyll serve --open` would interfere)
danyalaytekin Nov 12, 2023
03b60da
Fix npm lockfile version at `2`
danyalaytekin Nov 12, 2023
981929d
Fix whitespace
danyalaytekin Nov 12, 2023
520e9e0
Replace path changes with `npx --no`
danyalaytekin Nov 12, 2023
a18ecb9
Request npm 7, and use Node 16 by default, to get a version of npm wi…
danyalaytekin Nov 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
indent_style = space
trim_trailing_whitespace = false

[*.yml]
indent_style = space
indent_size = 2

[package.json]
indent_style = space
indent_size = 2
40 changes: 18 additions & 22 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@

name: Build and test

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
checkout_and_test:
runs-on: ubuntu-20.04
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code from ${{ github.repository }}
uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
node-version: 8
- name: Install node dependencies
run: npm ci
- name: Setup Ruby
uses: ruby/setup-ruby@v1
bundler-cache: true
- run: make build

test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Install Ruby gems
run: make install
- name: Build and serve Jekyll website
run: make serve &
- name: Test Jekyll website with Pa11y
run: make test
- uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- run: npm ci
- run: make serve
- run: make test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.sass-cache
_site
node_modules
.tool-versions
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lockfile-version=2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
16
2 changes: 1 addition & 1 deletion .pa11yci
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"defaults": {
"concurrency": 6
"concurrency": 1
}
}
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
3.2.2
6 changes: 4 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"recommendations": [
"ms-vscode.makefile-tools"
"ms-vscode.makefile-tools",
"github.vscode-github-actions",
"editorconfig.editorconfig"
]
}
}
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
source 'https://rubygems.org'
gem 'github-pages'

gem 'github-pages', "~> 228", group: :jekyll_plugins
gem "webrick", "~> 1.8"
Loading
Loading