From 2a07d84e329ff47336279a739686f9f91c626424 Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 15:20:44 -0400 Subject: [PATCH 1/6] feat: install forge dependencies in postinstall --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 9b02dd0..78afabb 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ }, "scripts": { "preinstall": "npx -y only-allow pnpm", + "postinstall": "forge install", "dev": "pnpm --parallel dev", "prettier": "pnpm --parallel --no-bail prettier", "lint": "pnpm --parallel --no-bail lint", From 15c08c5341fd9b3cc57c29ec46f937ce4e0a4cd1 Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 15:35:29 -0400 Subject: [PATCH 2/6] feat: install foundry for app jobs too --- .github/workflows/app.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index cfbad63..e05713f 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -24,6 +24,10 @@ jobs: uses: actions/checkout@v3 with: submodules: true + - name: Install Foundry + uses: onbjerg/foundry-toolchain@v1 + with: + version: nightly - name: Cache pnpm modules uses: actions/cache@v3 with: @@ -54,6 +58,10 @@ jobs: uses: actions/checkout@v3 with: submodules: true + - name: Install Foundry + uses: onbjerg/foundry-toolchain@v1 + with: + version: nightly - name: Cache pnpm modules uses: actions/cache@v3 with: From c9b5a6010129b158dbc87b6806993c64971e4dcf Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 17:51:33 -0400 Subject: [PATCH 3/6] feat: don't run forge postinstall in CI --- .github/workflows/app.yml | 4 ---- package.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index e05713f..ed5e665 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -24,10 +24,6 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - name: Install Foundry - uses: onbjerg/foundry-toolchain@v1 - with: - version: nightly - name: Cache pnpm modules uses: actions/cache@v3 with: diff --git a/package.json b/package.json index 78afabb..37bd219 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "scripts": { "preinstall": "npx -y only-allow pnpm", - "postinstall": "forge install", + "postinstall": "[[ -z $CI ]] && forge install", "dev": "pnpm --parallel dev", "prettier": "pnpm --parallel --no-bail prettier", "lint": "pnpm --parallel --no-bail lint", From 205db6c56f51e0d75b29f299e173db5f1af44619 Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 17:57:44 -0400 Subject: [PATCH 4/6] feat: use github actions compatible syntax --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37bd219..b937bfc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "scripts": { "preinstall": "npx -y only-allow pnpm", - "postinstall": "[[ -z $CI ]] && forge install", + "postinstall": "[ -z $CI ] && forge install", "dev": "pnpm --parallel dev", "prettier": "pnpm --parallel --no-bail prettier", "lint": "pnpm --parallel --no-bail lint", From 9e40f5a9d574948b5fbe5cbdd118f26b469b015b Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 18:03:05 -0400 Subject: [PATCH 5/6] feat: use logging to ensure no false return --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b937bfc..12d2f18 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "scripts": { "preinstall": "npx -y only-allow pnpm", - "postinstall": "[ -z $CI ] && forge install", + "postinstall": "[ -z $CI ] && forge install || echo \"Skipping forge install for CI\"", "dev": "pnpm --parallel dev", "prettier": "pnpm --parallel --no-bail prettier", "lint": "pnpm --parallel --no-bail lint", From e56640cb7141e2d40878bd55d83b5c51f666b34e Mon Sep 17 00:00:00 2001 From: Davis Shaver Date: Fri, 1 Jul 2022 18:05:59 -0400 Subject: [PATCH 6/6] feat: drop forge install from app action --- .github/workflows/app.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index ed5e665..cfbad63 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -54,10 +54,6 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - name: Install Foundry - uses: onbjerg/foundry-toolchain@v1 - with: - version: nightly - name: Cache pnpm modules uses: actions/cache@v3 with: