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.

Sign up for GitHub

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

ci: dangerfile and build-and-test updated #2847

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+15 −15
Open

ci: dangerfile and build-and-test updated #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29b18a4
ci: dangerfile fix
jpandersen87 Mar 22, 2024
18b68b6
Merge branch 'main' into dangerfile
jpandersen87 Mar 22, 2024
99517ec
bump node 18.x version, update build-and-test
jpandersen87 Mar 22, 2024
02037ca
fix sb brandImage url
jpandersen87 Mar 22, 2024
392d9b9
Merge branch 'main' into dangerfile
jpandersen87 Apr 8, 2024
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
15 changes: 7 additions & 8 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@ name: Build and Test

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]
workflow_dispatch:


jobs:
build-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node: [ '18' ]
node: ['18', '20']

name: Node ${{ matrix.node }} tests

steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
Expand All @@ -42,10 +41,10 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.15.0
18.19.1
9 changes: 5 additions & 4 deletions .storybook/USWDS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { create } from '@storybook/theming/create';
import { create } from '@storybook/theming/create'

export default create({
brandTitle: 'U.S. Web Design System (USWDS)',
brandUrl: 'https://github.com/trussworks/react-uswds',
brandImage: '/uswds.svg',
brandImage: 'uswds.svg',
brandTarget: '_self',
base: 'light',

// Text
fontBase: "'Public Sans Web', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
fontBase:
"'Public Sans Web', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
textColor: '#1b1b1b',
inputTextColor: '#1b1b1b',
textInverseColor: '#ffffff',
Expand All @@ -22,4 +23,4 @@ export default create({
appBorderRadius: 4,
inputBorder: '#5c5c5c',
inputBorderRadius: 4,
});
})
4 changes: 2 additions & 2 deletions dangerfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as child from 'child_process'

import { danger, fail, schedule, warn } from 'danger'

const shouldRun =
!danger.github || (danger.github && danger.github.pr?.user.type !== 'Bot')
// Only run on PRs from non-bots
const shouldRun = !!danger.github?.pr && danger.github.pr.user.type !== 'Bot'

// Load all modified and new files
const allFiles = (danger.git.modified_files ?? []).concat(
Expand Down
Loading