Skip to content

Commit

Permalink
refactor: switch back to a basic repo
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulRBerg committed Oct 12, 2021
1 parent b126cbd commit ad8dfc7
Show file tree
Hide file tree
Showing 85 changed files with 537 additions and 1,665 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
**/build
**/cache
**/coverage
**/coverage-contracts
**/coverage-src
**/dist
**/node_modules
**/typechain
Expand Down
27 changes: 12 additions & 15 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- "main"

jobs:
run-prb-proxy-integration:
run-contracts-integration:
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
Expand All @@ -32,26 +32,23 @@ jobs:
run: "yarn install --immutable"

- name: "Lint the code"
run: "yarn workspace prb-proxy lint"

- name: "Build prb-proxy.js"
run: "yarn workspace prb-proxy.js build:node"
run: "yarn lint:contracts"

- name: "Compile the contracts and generate the TypeChain bindings"
run: "yarn workspace prb-proxy typechain"
run: "yarn typechain"

- name: "Test the contracts and generate the coverage report"
run: "yarn workspace prb-proxy coverage"
run: "yarn coverage:contracts"

- name: "Prepare the coverage report"
uses: "coverallsapp/github-action@master"
with:
flag-name: "prb-proxy"
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel: true
path-to-lcov: "./packages/prb-proxy/coverage/lcov.info"
path-to-lcov: "./coverage-contracts/lcov.info"

run-prb-proxy-js-integration:
run-src-integration:
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
Expand All @@ -67,23 +64,23 @@ jobs:
run: "yarn install --immutable"

- name: "Lint the code"
run: "yarn workspace prb-proxy.js lint"
run: "yarn lint:ts"

- name: "Test the contracts and generate the coverage report"
run: "yarn workspace prb-proxy.js coverage"
- name: "Test the code and generate the coverage report"
run: "yarn coverage:src"

- name: "Prepare the coverage report"
uses: "coverallsapp/github-action@master"
with:
flag-name: "prb-proxy.js"
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel: true
path-to-lcov: "./packages/prb-proxy.js/coverage/lcov.info"
path-to-lcov: "./coverage-src/lcov.info"

upload-coverage-report:
needs:
- "run-prb-proxy-integration"
- "run-prb-proxy-js-integration"
- "run-contracts-integration"
- "run-src-integration"
runs-on: "ubuntu-latest"
steps:
- name: "Upload the coverage reports to Coveralls"
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
**/build
**/cache
**/coverage
**/coverage-contracts
**/coverage-src
**/dist
**/node_modules
**/typechain
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"*.{js,json,md,sol,ts,yaml,yml}": [
"prettier --config ./.prettierrc.js --write"
"prettier --config ./.prettierrc.yaml --write"
]
}
4 changes: 1 addition & 3 deletions packages/prb-proxy.js/.mocharc.yaml → .mocharc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
extension: "ts"
recursive: true
require:
- "earljs/mocha"
- "ts-node/register/transpile-only"
- "source-map-support/register"
spec: "test/**/*.test.ts"
spec: "test/src/**/*.ts"
watchExtension: "ts"
4 changes: 2 additions & 2 deletions packages/prb-proxy.js/.nycrc.yaml → .nycrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude:
extends: "@istanbuljs/nyc-config-typescript"
include:
- "src/**/*.ts"
report-dir: "coverage"
report-dir: "coverage-src"
reporter:
- "html"
- "nyc-report-lcov-absolute"
- "lcov"
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
**/build
**/cache
**/coverage
**/coverage-contracts
**/coverage-src
**/dist
**/node_modules
**/typechain
Expand Down
23 changes: 0 additions & 23 deletions .prettierrc.js

This file was deleted.

12 changes: 12 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
arrowParens: avoid
bracketSpacing: true
endOfLine: auto
printWidth: 120
singleQuote: false
tabWidth: 2
trailingComma: all

overrides:
- files: "*.sol"
options:
tabWidth: 4
1 change: 1 addition & 0 deletions packages/prb-proxy/.solcover.js → .solcover.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const shell = require("shelljs");

module.exports = {
istanbulFolder: "coverage-contracts",
istanbulReporter: ["html", "lcov"],
onCompileComplete: async function (_config) {
await run("typechain");
Expand Down
File renamed without changes.
File renamed without changes.
28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

2 changes: 0 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.0.2.cjs
Loading

0 comments on commit ad8dfc7

Please sign in to comment.