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

Speed up CI by parallelizing more things #1716

Merged
merged 5 commits into from
Dec 28, 2024
Merged
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
25 changes: 25 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Setup
description: Setup the workspace for the CI
runs:
using: "composite"
steps:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: "package.json"

- name: Restore dependencies
id: restore-dependencies
uses: actions/cache@v4
with:
path: node_modules
key: js-depend-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}

- name: Install dependencies
if: steps.restore-dependencies.outputs.cache-hit != 'true'
shell: bash
run: npm ci

- name: Build third-party libraries
shell: bash
run: npm run build:libs
32 changes: 0 additions & 32 deletions .github/workflows/bench.yml

This file was deleted.

120 changes: 46 additions & 74 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,89 +10,48 @@ on:
merge_group:

jobs:
static-analysis:
name: Static Analysis
tests:
name: ${{ matrix.name }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: "package.json"

- name: Install dependencies
run: npm ci
strategy:
matrix:
include:
- name: JavaScript
test: test:js
- name: TypeScript (main)
test: test:ts:main
- name: TypeScript (dev)
test: test:ts:dev
- name: TypeScript (test)
test: test:ts:test
- name: TypeScript (bench)
test: test:ts:bench
- name: CSS
test: test:css
- name: HTML
test: test:html
- name: Markdown
test: test:md
- name: JSON
test: test:json
- name: Unit Tests
test: test:unit
- name: Unit Tests (options)
test: test:unit:options

- name: Build third-party libraries
run: npm run build:libs

- name: Run static analysis tests
run: npm run test:static-analysis

static-analysis-json:
name: Static Analysis (JSON)
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/checkout@v4
- uses: ./.github/actions/setup

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: "package.json"

- name: Install dependencies
run: npm ci

- name: Build third-party libraries
run: npm run build:libs

- name: Run static analysis tests
run: npm run test:json

unit-tests:
name: Unit Tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: "package.json"

- name: Install dependencies
run: npm ci

- name: Build third-party libraries
run: npm run build:libs

- name: Run unit tests
run: npm run test:unit

- name: Run unit tests (options)
run: npm run test:unit:options
- name: Run ${{ matrix.name }} tests
run: npm run ${{ matrix.test }}

test-build:
name: Test Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: "package.json"

- name: Install dependencies
run: npm ci

- name: Build Libs
run: npm run build:libs
- uses: actions/checkout@v4
- uses: ./.github/actions/setup

- name: Build Legal
run: npm run license-report:html
Expand All @@ -106,3 +65,16 @@ jobs:
file: ext/manifest.json
schema: "https://json.schemastore.org/chrome-manifest.json"
fixSchemas: true

bench:
name: Benchmarks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup

- name: Run Benchmarks
uses: CodSpeedHQ/action@513a19673a831f139e8717bf45ead67e47f00044 # v3.2
with:
token: ${{ secrets.CODSPEED_TOKEN }}
run: npm run bench
1 change: 1 addition & 0 deletions .github/workflows/create-prerelease-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
with:
node-version-file: "package.json"

# intentially do not use cache to keep the build more comprehensible and sandboxed
- name: Install dependencies
run: npm ci

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@ jobs:
packages: fonts-ipafont-mincho
execute_install_scripts: true

- uses: actions/setup-node@v4
with:
cache: "npm"
node-version-file: "package.json"

- name: Install dependencies
run: npm ci
- uses: ./.github/actions/setup

- name: Build
run: npm run build
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@
"build:libs": "node ./dev/bin/build-libs.js",
"build:serve:firefox-android": "node ./dev/bin/build.js --target firefox-android && web-ext run -s ./builds/yomitan-firefox-android",
"build:serve:kiwi-browser": "node ./dev/bin/build.js --target chrome-dev && adb shell mkdir -p /sdcard/yomitan && adb push ./builds/yomitan-chrome-dev.zip /sdcard/yomitan/yomitan-kiwi-browser.zip",


"//WARNING": "These are convenience functions for running from CLI but are NOT called from CI because they are not parallel. Make sure you update CI scripts if you update these.",
"test": "npm run test:js && npm run test:ts && npm run test:css && npm run test:html && npm run test:unit && npm run test:unit:options && npm run test:json && npm run test:md && npm run test:build",
"test:fast": "npm run test:js && npm run test:ts && npm run test:unit && npm run test:json:format",
"test:static-analysis": "npm run test:js && npm run test:ts && npm run test:css && npm run test:html && npm run test:md",
"test:ts": "npm run test:ts:main && npm run test:ts:dev && npm run test:ts:test && npm run test:ts:bench",
"//END-WARNING": "",


"test:js": "npx eslint . --ignore-pattern '**/*.json'",
"test:json": "npm run test:json:format && npm run test:json:types",
"test:json:format": "npx eslint '**/*.json'",
Expand All @@ -27,7 +34,6 @@
"test:html": "npx html-validate \"ext/**/*.html\" \"test/**/*.html\" \"dev/**/*.html\"",
"test:md": "prettier . --check",
"test:md:write": "prettier . --write",
"test:ts": "npm run test:ts:main && npm run test:ts:dev && npm run test:ts:test && npm run test:ts:bench",
"test:ts:main": "npx tsc --noEmit --project jsconfig.json",
"test:ts:dev": "npx tsc --noEmit --project dev/jsconfig.json",
"test:ts:test": "npx tsc --noEmit --project test/jsconfig.json",
Expand Down
Loading