Skip to content

Commit

Permalink
Switch to yarn workspaces (OctoLinker#877)
Browse files Browse the repository at this point in the history
Co-authored-by: Stefan Buck <[email protected]>
  • Loading branch information
stefanbuck and Stefan Buck authored Apr 6, 2020
1 parent 5877eed commit 490b165
Show file tree
Hide file tree
Showing 8 changed files with 10,513 additions and 26,454 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,24 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: npm ci
- run: npm test
- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn install
- run: yarn test
env:
CI: true
- run: npm run build
- run: yarn build
- name: Run E2E
uses: mujo-code/puppeteer-headful@master
env:
CI: true
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
with:
args: npm run e2e
args: yarn e2e
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: '12.x'
- run: npm ci
- run: npm run build
- run: 'npm run release'
- run: yarn install
- run: yarn build
- run: 'yarn release'
env:
CLIENT_ID: ${{ secrets.PUBLISHER_CHROME_CLIENT_ID }}
CLIENT_SECRET: ${{ secrets.PUBLISHER_CHROME_CLIENT_SECRET }}
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ First off, thanks for taking the time to contribute! :tada: :+1:
To build and run the extension follow these steps.

1. Clone the repository.
1. Run `npm install` to setup the project and install all required dependencies.
1. Run `yarn install` to setup the project and install all required dependencies.
1. Start hacking. If you're adding a plugin, you may be interested in seeing the commits that add these plugins:
* [CSS]
1. Build and load the extension:
* Firefox (Quickstart):
1. `npm run firefox-open`
1. `yarn firefox-open`
* Chrome (Quickstart):
1. `npm run chrome-open`
1. `yarn chrome-open`
* Chrome (Long Version):
1. To build the extension once run `npm run build` or `npm start` during development.
1. To build the extension once run `yarn build` or `yarn start` during development.
1. Load extension https://developer.chrome.com/extensions/getstarted#unpacked.

[CSS]: https://github.com/OctoLinker/OctoLinker/commit/ccbefb7
Expand All @@ -37,9 +37,9 @@ The outline above is an extremely simplified version. In real life you have to d
- Please check to make sure that there aren't existing pull requests attempting to address the issue mentioned. We also recommend checking for issues related to the issue on the tracker, as a team member may be working on the issue in a branch or fork.
- Non-trivial changes should be discussed in an issue first
- Develop in a topic branch, not master
- Lint the code by `npm run lint`
- Lint the code by `yarn lint`
- Add relevant tests to cover the change
- Make sure test-suite passes: `npm test`
- Make sure test-suite passes: `yarn test`
- Document any new features in [README.md](./README.md#features)
- Squash your commits
- Write a convincing description of your PR and why we should land it
Expand Down
2 changes: 1 addition & 1 deletion e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ Before we invoke [jest](https://github.com/facebook/jest), we scan the fixtures

We made this process super simple. Just create files within `e2e/fixtures` and make sure the annotations are correct, that's all. If you have a minute or two, we would really appreciate a pull request from you!

By default e2e tests run against the latest OctoLinker master. However, you can overwrite the target as follow `TRAVIS_PULL_REQUEST_SLUG=stefanbuck/OctoLinker TRAVIS_PULL_REQUEST_BRANCH=fix-642 npm run e2e`
By default e2e tests run against the latest OctoLinker master. However, you can overwrite the target as follow `TRAVIS_PULL_REQUEST_SLUG=stefanbuck/OctoLinker TRAVIS_PULL_REQUEST_BRANCH=fix-642 yarn e2e`
11 changes: 0 additions & 11 deletions lerna.json

This file was deleted.

Loading

0 comments on commit 490b165

Please sign in to comment.