Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
micheal-parks committed Feb 29, 2024
2 parents 7e0089a + 3aea62f commit eabb123
Show file tree
Hide file tree
Showing 16 changed files with 2,411 additions and 2,752 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
site
9 changes: 9 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

module.exports = {
root: true,
extends: ['@viamrobotics/eslint-config'],
parserOptions: {
project: ['./tsconfig.json'],
},
};
18 changes: 8 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,25 @@ jobs:
persist-credentials: false

- name: Setup Node
uses: actions/setup-node@v3
uses: viamrobotics/js-config/.github/actions/setup@618c7955f0a8261bb3cc783f2b26fcc2c9bffa3d
with:
node-version: 20

- name: Install and Build 🔧
- name: Build 🔧
run: |
npm ci --audit=false
npm run build-site
npm run build
pnpm run build-site
pnpm run build
- name: Deploy Site 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
BRANCH: gh-pages
FOLDER: site
CLEAN: true
branch: gh-pages
folder: site
clean: true
clean-exclude: |
.nojekyll
- name: Publish 🚀
uses: JS-DevTools/npm-publish@v2.1
uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552
with:
token: ${{ secrets.NPM_TOKEN }}

48 changes: 30 additions & 18 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,41 @@ on:
- main

jobs:
# eslint:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - name: Install 🔧
# run: npm ci --audit=false
# - name: Run ESLint
# run: npm run lint
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: viamrobotics/js-config/.github/actions/setup@618c7955f0a8261bb3cc783f2b26fcc2c9bffa3d
with:
node-version: 20

- name: Lint/format checks
run: pnpm run lint

check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install 🔧
run: npm ci --audit=false
- name: Run Check
run: npm run check
- uses: actions/checkout@v3

- name: Setup Node
uses: viamrobotics/js-config/.github/actions/setup@618c7955f0a8261bb3cc783f2b26fcc2c9bffa3d
with:
node-version: 20

- name: Type checks
run: pnpm run check

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install 🔧
run: npm ci --audit=false
- name: Run Test
run: npm run test-run
- uses: actions/checkout@v3

- name: Setup Node
uses: viamrobotics/js-config/.github/actions/setup@618c7955f0a8261bb3cc783f2b26fcc2c9bffa3d
with:
node-version: 20

- name: Tests
run: pnpm run test-run
11 changes: 0 additions & 11 deletions .npmignore

This file was deleted.

3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist
pnpm-lock.yaml
site
6 changes: 6 additions & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<<<<<<< HEAD

Check failure on line 1 in .prettierrc.cjs

View workflow job for this annotation

GitHub Actions / check

Merge conflict marker encountered.
'use strict';

module.exports = require('@viamrobotics/prettier-config');
=======

Check failure on line 5 in .prettierrc.cjs

View workflow job for this annotation

GitHub Actions / check

Merge conflict marker encountered.
'use strict'

module.exports = '@viamrobotics/prettier-config';
>>>>>>> 3aea62f3aab31018508a69ba3cc6087ced38086a

Check failure on line 9 in .prettierrc.cjs

View workflow job for this annotation

GitHub Actions / check

Merge conflict marker encountered.
Loading

0 comments on commit eabb123

Please sign in to comment.