Skip to content

Commit

Permalink
chore: fold CI actions into GitHub Actions, deploy SB to GH Pages
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiehenson committed Mar 15, 2024
1 parent 956f1c5 commit 335911e
Show file tree
Hide file tree
Showing 17 changed files with 822 additions and 405 deletions.
176 changes: 0 additions & 176 deletions .circleci/config.yml

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Run linters and Cypress

on:
push:
branches-ignore:
- "gh-pages"
pull_request:
types: [closed]
branches:
- main

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- name: Check out Git repository
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 16
- name: Install dependencies
run: yarn
- name: Lint
uses: wearerequired/lint-action@v2
with:
eslint: true
eslint_dir: src
eslint_extensions: js,ts,jsx,tsx
eslint_auto_fix: false
prettier: true
prettier_dir: src
prettier_extensions: js,ts,jsx,tsx
prettier_auto_fix: false
# Cypress disabled until tests rewritten to use new SB paths
# - name: Cypress
# uses: cypress-io/github-action@v6
# with:
# start: yarn start
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ jobs:
git config --global user.name "Github Action"
./scripts/release.sh "${GITHUB_REF/refs\/tags\//}"
shell: bash
- uses: bitovi/[email protected]
with:
install_command: yarn install
build_command: yarn build-storybook
path: preview
checkout: false
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
vendor
./core
./reset
./preview/public
./preview/tmp
preview
node_modules
3 changes: 3 additions & 0 deletions bs-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"port": 5000
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"eslint-plugin-storybook": "^0.6.15",
"extra-watch-webpack-plugin": "^1.0.3",
"find-imports": "^1.1.0",
"lite-server": "^2.6.1",
"mini-css-extract-plugin": "^1.2.1",
"msw": "1.3.2",
"msw-storybook-addon": "^1.10.0",
Expand Down Expand Up @@ -76,6 +77,7 @@
"update:all": "./scripts/update-dependents.sh",
"pre-release": "./scripts/pre-release.sh",
"release": "./scripts/release.sh",
"start": "lite-server -- port 5000",
"storybook": "storybook dev -p 6006 --no-version-updates",
"build-storybook": "storybook build"
},
Expand Down Expand Up @@ -110,4 +112,4 @@
"msw": {
"workerDirectory": "public"
}
}
}
4 changes: 0 additions & 4 deletions preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
"name": "preview",
"private": true,
"dependencies": {
<<<<<<< HEAD
"@ably/ui": "13.2.2-dev.78815ed",
=======
"@ably/ui": "13.1.0-dev.49a8f15",
>>>>>>> 8f4175c (Publish v13.1.0-dev.49a8f15 and update preview app)
"@babel/preset-react": "^7.12.5",
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "5.4.4",
Expand Down
7 changes: 0 additions & 7 deletions preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@
# yarn lockfile v1


<<<<<<< HEAD
"@ably/[email protected]":
version "13.2.2-dev.78815ed"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-13.2.2-dev.78815ed.tgz#3b0329452a7d294aab064ee2a196ce6cec7fad43"
integrity sha512-JLX8CWo06ZuxfA1m1au0KsNjZ7IMCRtvTMQyljshZqVGJpVjo09Mzj22PheUpcsWlhYZkMYYuHupDr/8qI+NjQ==
=======
"@ably/[email protected]":
version "13.1.0-dev.49a8f15"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-13.1.0-dev.49a8f15.tgz#3d9f1dc2040aad7619bb8be999294568e90bb73b"
integrity sha512-O1+X7Wf1zvQTlSE2nAAgG5JEIUc1BR1vbxd+lGFoA9ZDxiRllJqC1gB2LMNTiTuWUIqjFMMMvJ0RW3t0WS9wNg==
>>>>>>> 8f4175c (Publish v13.1.0-dev.49a8f15 and update preview app)
dependencies:
"@mrtkrcm/cypress-plugin-snapshots" "https://github.com/mrtkrcm/cypress-plugin-snapshots#v1.13.0"
addsearch-js-client "^0.7.0"
Expand Down
Loading

0 comments on commit 335911e

Please sign in to comment.