Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:

- name: Install dependencies
run: |
npm i -g bower grunt-cli
npm i -g grunt-cli
npm ci

- name: Copy the missing _sprite_share.scss file - related to GCWeb#1737 about wet-boew#cc340a6 commit
Expand Down
36 changes: 13 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Continuos integration

on:
push:
branches-ignore:
- "dependabot/**"
pull_request:

jobs:
Expand All @@ -16,42 +19,29 @@ jobs:
steps:
- uses: actions/checkout@v4

# - name: Cache node modules
# uses: actions/cache@v2
# if: ${{ !env.ACT }}
# env:
# cache-name: cache-node-modules
# with:
# # npm cache files are stored in '~/.npm' on Linux/macOS
# path: ~/.npm
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
# restore-keys: |
# ${{ runner.os }}-build-${{ env.cache-name }}-
# ${{ runner.os }}-build-
# ${{ runner.os }}-

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- name: Install dependencies
run: |
npm i -g bower grunt-cli
npm ci
- name: Install Grunt
run: npm i -g grunt-cli --force

- name: Install npm dependencies
run: npm ci

- name: Copy the missing _sprite_share.scss file - related to GCWeb#1737 about wet-boew#cc340a6 commit
run: |
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/2c25ce9ff228394e626404a35c62f7bc047b13e7/_sprites_share.scss >> _sprites_share.scss
mv _sprites_share.scss node_modules/wet-boew/src/plugins/share/sprites/_sprites_share.scss

- name: Checkout wet-boew latest build
- uses: actions/checkout@v4
if: ${{ env.ACT }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the condition it doesn't look like this is currently being run. Maybe better to just remove the change or this step

run: |
git clone --depth 1 https://github.com/wet-boew/wet-boew-cdn.git --branch v4.0-dist ~wet-boew-cdn
mkdir -p node_modules/wet-boew/dist/wet-boew
mv ~wet-boew-cdn/* node_modules/wet-boew/dist/wet-boew
with:
repository: wet-boew/wet-boew-cdn
ref: v4.0-dist
path: node_modules/wet-boew/dist/wet-boew

- name: Build GCWeb
if: ${{ !env.ACT }}
Expand Down
82 changes: 82 additions & 0 deletions .github/workflows/lint-html.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: HTML Linting
on:
push:
branches-ignore:
- "dependabot/**"
paths:
- "package*.json"
- "Gruntfile.coffee"
- "Rakefile"
- "**/*.hbs"
- "**/*.html"
- ".github/workflows/lint-html.yml"

pull_request:
paths:
- "package*.json"
- "Gruntfile.coffee"
- "Rakefile"
- "**/*.hbs"
- "**/*.html"
- ".github/workflows/lint-html.yml"

jobs:
lint-html:
runs-on: ubuntu-latest

steps:
- name: Clone repository
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 8
distribution: "temurin"

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: "3.3"

- name: Set up Node.js
uses: actions/setup-node@v4
with:
cache: npm

- name: Install Grunt
run: npm i -g grunt-cli --force

- name: Install npm dependencies
run: npm ci

# Related to GCWeb#1737 about wet-boew#cc340a6 commit
- name: Copy the missing _sprite_share.scss file
run: |
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/86e7a0b15ad6a695754599e9793e986b460bf514/_sprites_share.scss >> _sprites_share.scss
mv _sprites_share.scss node_modules/wet-boew/src/plugins/share/sprites/_sprites_share.scss

- name: Build GCWeb
run: grunt build-gh-pages

# Overwrite all layout and includes and remove dist from .gitignore
- name: Update GCWeb Jekyll theme files
run: |
cp -R ~jekyll-dist/_includes/* _includes/
cp -R ~jekyll-dist/_layouts/* _layouts/

- name: Setup Pages
id: pages
uses: actions/configure-pages@v5

# Generate all the Jekyll files and push to ./_site
- name: Build with Jekyll
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
env:
JEKYLL_ENV: production
- name: HTMLlint
run: grunt htmllint

- name: HTMLProofer
run: bundle exec rake
39 changes: 39 additions & 0 deletions .github/workflows/lint-json.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: JSON Linting
on:
push:
branches-ignore:
- "dependabot/**"
paths:
- "Gruntfile.coffee"
- "**/*.json"
- "**/*.json-ld"
- ".github/workflows/lint-json.yml"

pull_request:
paths:
- "Gruntfile.coffee"
- "**/*.json"
- "**/*.json-ld"
- ".github/workflows/lint-json.yml"

jobs:
lint-js:
runs-on: ubuntu-latest

steps:
- name: Clone repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
cache: npm

- name: Install Grunt
run: npm i -g grunt-cli --force

- name: Install npm dependencies
run: npm ci --ignore-scripts

- name: JSONLint
run: grunt jsonlint
2 changes: 1 addition & 1 deletion .github/workflows/lint-md.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cache: npm

- name: Install Grunt
run: npm i -g bower grunt-cli --force
run: npm i -g grunt-cli --force

- name: Install npm dependencies
run: npm ci --ignore-scripts
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/lint-spaces.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Space Linting
on:
push:
branches-ignore:
- "dependabot/**"
paths:
- "**"
- "!**/*.{ico,jpg,png}"
- "!**/*.{eot,svg,ttf,woff}"
- ".github/workflows/lint-spaces.yml"

pull_request:
paths:
- "**"
- "!**/*.{ico,jpg,png}"
- "!**/*.{eot,svg,ttf,woff}"
- ".github/workflows/lint-spaces.yml"

jobs:
lint-spaces:
runs-on: ubuntu-latest

steps:
- name: Clone repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
cache: npm

- name: Install Grunt
run: npm i -g grunt-cli --force

- name: Install npm dependencies
run: npm ci

- name: Lintspaces
run: grunt lintspaces
6 changes: 4 additions & 2 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -1063,8 +1063,10 @@ module.exports = (grunt) ->
jsonlint:
all:
src: [
"{sites,common,components,templates,design-patterns,wet-boew}/**/*.json",
"{sites,common,components,templates,design-patterns,wet-boew}/**/*.json-ld"
"**/*.json",
"**/*.json-ld"
"!_wetboew-demos/**"
"!node_modules/**"
]
options: {
indent: "\t"
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require "html-proofer"
task :default => [:test]

task :test do
HTMLProofer.check_directory("/_site/", {
HTMLProofer.check_directory("_site/", {
:ignore_urls => [
"#",
"wetboew-demos/"
Expand Down
1 change: 0 additions & 1 deletion docs/reporting-a11y.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ <h2 id="testReq">Assessment test requirement summary</h2>
<h3 class="h5">{{ component.name }}</h3>
<ul>
{% for assessment in component.a11y %}
<!-- <li data-wb-tags="{{ assessment.outcome }} {{% if assessment.isApplicable -%}}isApplicable{{%- endif -%}}"> -->
<li><a href="../{{ assessment.link }}">{{ assessment.date }} - {{ assessment.outcome }}</a></li>
{% else %}
<li>None</li>
Expand Down
2 changes: 1 addition & 1 deletion script/setup
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
npm install -g bower grunt-cli && npm install
npm install -g grunt-cli && npm install
2 changes: 1 addition & 1 deletion script/setup.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
npm install -g bower grunt-cli && npm install
npm install -g grunt-cli && npm install
Loading