tweaks

jgeary · Apr 18, 2022 · a568f3e · a568f3e
1 parent af8f7a0
commit a568f3e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 43 deletions.
diff --git a/.github/workflows/deploy-core.yml b/.github/workflows/deploy-core.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
-      - run: npm install
+      - run: npm install && npm install --global yarn
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
         with:
@@ -33,7 +33,7 @@ jobs:
       - name: Run deploy script
         run: bash ./deploy/deploy-core.sh ${{ github.event.inputs.overwrite }}
       - name: Bump version
-        run: npm i -g json-bump && json-bump package.json && npm i -g json && echo "TAG=v$(cat package.json | json version)" >> $GITHUB_ENV
+        run: npm i -g json-bump && json-bump package.json && yarn prettier --write package.json && npm i -g json && echo "TAG=v$(cat package.json | json version)" >> $GITHUB_ENV
       - name: Push new addresses and package.json
         uses: EndBug/add-and-commit@v9
         with:

diff --git a/.github/workflows/deploy-module.yml b/.github/workflows/deploy-module.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
-      - run: npm install
+      - run: npm install && npm install --global yarn
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
         with:
@@ -45,7 +45,7 @@ jobs:
       - name: Run deploy script
         run: bash ./deploy/deploy-module.sh ${{ github.event.inputs.overwrite }} ${{ github.event.inputs.module_path }} ${{ github.event.inputs.module_name }} ${{ github.event.inputs.constructor_abi }} ${{ github.event.inputs.constructor_args }}
       - name: Bump version
-        run: npm i -g json-bump && json-bump package.json && npm i -g json && echo "TAG=v$(cat package.json | json version)" >> $GITHUB_ENV
+        run: npm i -g json-bump && json-bump package.json && yarn prettier --write package.json && npm i -g json && echo "TAG=v$(cat package.json | json version)" >> $GITHUB_ENV
       - name: Push new addresses
         uses: EndBug/add-and-commit@v9
         with:

diff --git a/package.json b/package.json
@@ -1,41 +1,41 @@
 {
-    "name": "blahblahblahtestasdf",
-    "version": "1.0.32",
-    "private": false,
-    "homepage": "https://github.com/ourzora/v3",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/ourzora/v3.git"
-    },
-    "files": [
-        "dist/**/*",
-        "dist/*"
-    ],
-    "dependencies": {
-        "@manifoldxyz/royalty-registry-solidity": "^1.0.9",
-        "@openzeppelin/contracts": "^4.5.0",
-        "@rari-capital/solmate": "^6.2.0"
-    },
-    "devDependencies": {
-        "@typechain/ethers-v5": "^10.0.0",
-        "husky": "^7.0.0",
-        "lint-staged": "^12.3.7",
-        "prettier": "^2.6.1",
-        "prettier-plugin-solidity": "^1.0.0-beta.19",
-        "solhint": "^3.3.7",
-        "solhint-plugin-prettier": "^0.0.5",
-        "typechain": "^8.0.0",
-        "typescript": "^4.6.3"
-    },
-    "lint-staged": {
-        "*.{ts,js,css,md,sol}": "prettier --write",
-        "*.sol": "solhint"
-    },
-    "scripts": {
-        "build": "forge build && yarn typechain",
-        "clean": "forge clean && rm -rf ./dist",
-        "prepublishOnly": "rm -rf ./dist && forge clean && forge build && yarn typechain && cp -R contracts dist && cp -R addresses dist",
-        "test": "forge test",
-        "typechain": "typechain --target=ethers-v5 'dist/artifacts/*/*.json' --out-dir dist/typechain"
-    }
+  "name": "blahblahblahtestasdf",
+  "version": "1.0.32",
+  "private": false,
+  "homepage": "https://github.com/ourzora/v3",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ourzora/v3.git"
+  },
+  "files": [
+    "dist/**/*",
+    "dist/*"
+  ],
+  "dependencies": {
+    "@manifoldxyz/royalty-registry-solidity": "^1.0.9",
+    "@openzeppelin/contracts": "^4.5.0",
+    "@rari-capital/solmate": "^6.2.0"
+  },
+  "devDependencies": {
+    "@typechain/ethers-v5": "^10.0.0",
+    "husky": "^7.0.0",
+    "lint-staged": "^12.3.7",
+    "prettier": "^2.6.1",
+    "prettier-plugin-solidity": "^1.0.0-beta.19",
+    "solhint": "^3.3.7",
+    "solhint-plugin-prettier": "^0.0.5",
+    "typechain": "^8.0.0",
+    "typescript": "^4.6.3"
+  },
+  "lint-staged": {
+    "*.{ts,js,css,md,sol}": "prettier --write",
+    "*.sol": "solhint"
+  },
+  "scripts": {
+    "build": "forge build && yarn typechain",
+    "clean": "forge clean && rm -rf ./dist",
+    "prepublishOnly": "rm -rf ./dist && forge clean && forge build && yarn typechain && cp -R contracts dist && cp -R addresses dist",
+    "test": "forge test",
+    "typechain": "typechain --target=ethers-v5 'dist/artifacts/*/*.json' --out-dir dist/typechain"
+  }
 }