Skip to content

Commit

Permalink
build: use workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
heueristik committed Oct 13, 2023
1 parent 7d1fc37 commit 83f6da3
Show file tree
Hide file tree
Showing 10 changed files with 6,253 additions and 9,383 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/contracts-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Contracts'

env:
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
working-directory: .
working-directory: contracts

on:
workflow_dispatch:
Expand Down Expand Up @@ -30,10 +30,6 @@ jobs:
- name: 'Install general dependencies'
run: 'yarn install'

- name: 'Install contracts dependencies'
run: 'yarn install'
working-directory: contracts

- name: 'Lint the contracts'
run: 'yarn lint:sol'
working-directory: contracts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: 'yarn install'

- name: 'Lint the code'
run: 'yarn lint'
run: 'yarn lint:ts'

- name: 'Check code formatting'
run: yarn prettier:check
10 changes: 2 additions & 8 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@aragon/todo-osx-plugin-contracts",
"name": "@aragon/osx-commons",
"license": "AGPL-3.0-or-later",
"description": "",
"version": "1.0.0",
Expand All @@ -22,11 +22,7 @@
"@typechain/hardhat": "^6.1.4",
"@types/chai": "^4.3.4",
"@types/mocha": "^10.0.0",
"@types/node": "^18.11.9",
"chai": "^4.3.7",
"cross-env": "^7.0.3",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"ethers": "^5.7.2",
"hardhat": "^2.13.1",
"hardhat-deploy": "^0.11.26",
Expand All @@ -36,8 +32,7 @@
"solhint": "^3.4.0",
"solhint-plugin-prettier": "^0.0.5",
"solidity-coverage": "^0.8.2",
"solidity-docgen": "^0.6.0-beta.36",
"tmp-promise": "^3.0.3"
"solidity-docgen": "^0.6.0-beta.36"
},
"dependencies": {
"@aragon/osx": "aragon/osx#develop",
Expand Down Expand Up @@ -68,7 +63,6 @@
"build": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
"coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
"deploy": "hardhat deploy",
"lint": "yarn lint:sol && yarn lint:ts",
"lint:sol": "solhint --max-warnings 0 \"src/**/*.sol\"",
"postinstall": "DOTENV_CONFIG_PATH=../.env.example yarn typechain",
"test": "hardhat test",
Expand Down
4 changes: 2 additions & 2 deletions contracts/utils/ipfs.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {BytesLike, ethers} from 'ethers';
import IPFS from 'ipfs-http-client';
import {createHelia} from 'helia';

export async function uploadToIPFS(
content: string,
testing: boolean = true
): Promise<string> {
const client = IPFS.create({
const client = createHelia({
url: testing
? 'https://testing-ipfs-0.aragon.network/api/v0'
: 'https://ipfs-0.aragon.network/api/v0',
Expand Down
Loading

0 comments on commit 83f6da3

Please sign in to comment.