From 077c6dfb55cf2153bbf1883d891f8e37969cfc36 Mon Sep 17 00:00:00 2001 From: zorzal Date: Fri, 27 Sep 2024 07:47:54 -0400 Subject: [PATCH 1/3] ci: use node-version 20.x in ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a56be2a..718cf6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 From f6966051c74a25e02d27e68ac685aec6bc925b82 Mon Sep 17 00:00:00 2001 From: zorzal Date: Fri, 27 Sep 2024 09:07:29 -0400 Subject: [PATCH 2/3] ci: update github actions checkout@v3 and setup-node@v3 use node 16 under the hood, which was deprecated in 2023. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 718cf6e..fb37232 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,9 @@ jobs: name: Foundry project runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: "yarn" @@ -51,7 +51,7 @@ jobs: node-version: [20.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 @@ -59,7 +59,7 @@ jobs: version: nightly - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: "yarn" From 10147f5c73ea1b4f8eaec69868b0fcb498ab538a Mon Sep 17 00:00:00 2001 From: zorzal Date: Thu, 26 Sep 2024 17:41:08 -0400 Subject: [PATCH 3/3] chore: bump husky version * bump version to 9.1.6 * upgrade husky scripts * update yarn.lock --- .husky/commit-msg | 3 --- .husky/pre-commit | 3 --- package.json | 6 +++--- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.husky/commit-msg b/.husky/commit-msg index 314e821..d468455 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npx --no-install commitlint --edit $1 \ No newline at end of file diff --git a/.husky/pre-commit b/.husky/pre-commit index d24fdfc..2312dc5 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx lint-staged diff --git a/package.json b/package.json index 74cc75c..07a15ed 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "coverage": "forge coverage --match-contract Unit", "deploy": "dotenv -- bash -c 'forge script Deploy -vv --slow --broadcast --rpc-url $OPTIMISM_RPC'", "deploy:local": "dotenv -- bash -c 'forge script Deploy -vv --slow --broadcast --rpc-url $LOCAL_RPC'", - "postinstall": "husky install", + "postinstall": "husky", "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check", "lint:fix": "sort-package-json && forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix", "lint:sol-logic": "solhint 'solidity/contracts/**/*.sol' 'solidity/interfaces/**/*.sol'", "lint:sol-tests": "solhint -c .solhint.tests.json 'solidity/test/**/*.sol'", - "prepare": "husky install", + "prepare": "husky", "prepublishOnly": "pinst --disable", "postpublish": "pinst --enable", "release": "standard-version", @@ -41,7 +41,7 @@ "dotenv-cli": "7.2.1", "ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0", "forge-std": "https://github.com/foundry-rs/forge-std.git#v1.7.3", - "husky": "8.0.3", + "husky": "9.1.6", "lint-staged": "13.2.2", "pinst": "3.0.0", "solhint": "3.5.1", diff --git a/yarn.lock b/yarn.lock index 2c7a91b..e314636 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1519,10 +1519,10 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== -husky@8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" - integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== +husky@9.1.6: + version "9.1.6" + resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.6.tgz#e23aa996b6203ab33534bdc82306b0cf2cb07d6c" + integrity sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A== iconv-lite@^0.4.24: version "0.4.24"