Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/npm_and_yarn/word-wrap-1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Corantin authored Nov 6, 2023
2 parents d428094 + 88c1f96 commit 888a870
Show file tree
Hide file tree
Showing 175 changed files with 37,291 additions and 7,269 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Case Sensitivity Checker
uses: credfeto/[email protected]
- name: Install
run: yarn ci
run: yarn install
- name: Lint
run: yarn lint

Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
key: ${{ runner.os }}-contracts-v${{ secrets.CONTRACTS_CACHE_VERSION }}-${{ hashFiles('packages/*/contracts/**/*.sol') }}

- name: Install dependencies
run: yarn ci
run: yarn install

- name: Build contracts
run: yarn compile
Expand Down
35 changes: 28 additions & 7 deletions honey-quest.code-workspace
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
{
"folders": [
{ "name": "WebApp", "path": "./packages/react-app" },
{ "name": "Hardhat", "path": "./packages/hardhat" },
{ "name": "Subgraph", "path": "./packages/subgraphs" },
{ "name": "Services", "path": "./packages/services" },
{ "name": "E2E", "path": "./packages/e2e" },
{ "name": "Root", "path": "." }
{
"name": "WebApp",
"path": "./packages/react-app"
},
{
"name": "Hardhat",
"path": "./packages/hardhat"
},
{
"name": "Subgraph",
"path": "./packages/subgraphs"
},
{
"name": "Services",
"path": "./packages/services"
},
{
"name": "E2E",
"path": "./packages/e2e"
},
{
"name": "Root",
"path": "."
}
],
"settings": {
"typescript.tsdk": "WebApp/node_modules/typescript/lib",
Expand All @@ -15,6 +33,9 @@
},
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[properties]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
}
},
"extensions": {
Expand All @@ -26,4 +47,4 @@
"styled-components.vscode-styled-components"
]
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
"ts-node": "^10.2.1",
"typescript": "^4.4.2"
}
}
}
Loading

0 comments on commit 888a870

Please sign in to comment.