fix: remapping for foundry-upgrades

ci: build contracts

Author: PaulRBerg

.github/workflows/ci.yml

@@ -20,23 +20,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: extractions/setup-just@v3
-      - uses: foundry-rs/foundry-toolchain@v1
+      - uses: sablier-labs/devkit/actions/setup@main
         with:
-          version: "nightly"
-      - uses: oven-sh/setup-bun@v2
-      - run: npm install -g @antfu/ni
-      - run: bun install
+          frozen-lockfile: false
+          package-manager: bun
 
       - name: Run all code checks
         run: just full-check
 
-      # - name: Build all packages
-      #   run: just build-all
-
   test-unit:
     needs: check
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        workspace: [airdrops, lockup]
     steps:
       - uses: actions/checkout@v5
       - uses: foundry-rs/foundry-toolchain@v1
@@ -45,18 +42,25 @@ jobs:
       - uses: oven-sh/setup-bun@v2
       - run: bun install
 
+      - name: Build contracts
+        run: |
+          just build ${{ matrix.workspace }} optimized
+
       - name: Run unit tests
         env:
           FOUNDRY_FUZZ_RUNS: 2000
           FOUNDRY_PROFILE: test-optimized
         run: | #shell
           forge test \
             --match-path "tests/unit/**/*.sol" \
-            --root lockup
+            --root ${{ matrix.workspace }}
 
   test-integration:
     needs: check
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        workspace: [airdrops, flow, lockup, utils]
     steps:
       - uses: actions/checkout@v5
       - uses: foundry-rs/foundry-toolchain@v1
@@ -65,18 +69,27 @@ jobs:
       - uses: oven-sh/setup-bun@v2
       - run: bun install
 
+      - name: Build contracts
+        env:
+          FOUNDRY_PROFILE: optimized
+        run: |
+          just build ${{ matrix.workspace }}
+
       - name: Run integration tests
         env:
           FOUNDRY_FUZZ_RUNS: 2000
           FOUNDRY_PROFILE: test-optimized
         run: | #shell
           forge test \
             --match-path "tests/integration/**/*.sol" \
-            --root lockup
+            --root ${{ matrix.workspace }}
 
   test-invariant:
     needs: check
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        workspace: [flow, lockup, utils]
     steps:
       - uses: actions/checkout@v5
       - uses: foundry-rs/foundry-toolchain@v1
@@ -85,10 +98,16 @@ jobs:
       - uses: oven-sh/setup-bun@v2
       - run: bun install
 
+      - name: Build contracts
+        env:
+          FOUNDRY_PROFILE: optimized
+        run: |
+          just build ${{ matrix.workspace }}
+
       - name: Run invariant tests
         env:
           FOUNDRY_PROFILE: test-optimized
         run: | #shell
           forge test \
             --match-path "tests/invariant/**/*.sol" \
-            --root lockup
+            --root ${{ matrix.workspace }}

justfile

@@ -18,14 +18,14 @@ GLOBS_SOLIDITY := "**/*.sol"
 default:
   @just --list
 
-# Build a package with a specific profile
-@build package profile="default":
-    FOUNDRY_PROFILE={{ profile }} forge build --root {{ package }}
+# Build a specific workspace
+@build workspace:
+    forge build --root {{ workspace }}
 alias b := build
 
-# Build all packages with a specific profile
-@build-all profile="default":
-    FOUNDRY_PROFILE={{ profile }} just for-each "forge build --root"
+# Build all workspaces
+@build-all:
+    just for-each "forge build --root"
 
 # Check code with Forge formatter
 @fmt-check:

utils/foundry.toml

@@ -10,6 +10,9 @@
   ffi = true
   gas_reports = ["*"]
   optimizer_runs = 10_000
+  remappings = [
+    "openzeppelin-foundry-upgrades/=../node_modules/@openzeppelin/foundry-upgrades/",
+  ]
   script = "scripts"
 
 [profile.default.fuzz]

utils/scripts/solidity/DeployComptrollerProxy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22;
 
-import { Options, Upgrades } from "@openzeppelin/foundry-upgrades/src/Upgrades.sol";
+import { Options, Upgrades } from "openzeppelin-foundry-upgrades/src/Upgrades.sol";
 import { SablierComptroller } from "src/SablierComptroller.sol";
 import { BaseScript } from "src/tests/BaseScript.sol";
 

utils/scripts/solidity/UpgradeComptrollerProxy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22;
 
-import { Options, Upgrades } from "@openzeppelin/foundry-upgrades/src/Upgrades.sol";
+import { Options, Upgrades } from "openzeppelin-foundry-upgrades/src/Upgrades.sol";
 import { BaseScript } from "src/tests/BaseScript.sol";
 
 /// @notice Deploys a new Sablier Comptroller.

utils/tests/Base.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22 <0.9.0;
 
-import { Upgrades } from "@openzeppelin/foundry-upgrades/src/Upgrades.sol";
+import { Upgrades } from "openzeppelin-foundry-upgrades/src/Upgrades.sol";
 import { StdAssertions } from "forge-std/src/StdAssertions.sol";
 
 import { ISablierComptroller } from "src/interfaces/ISablierComptroller.sol";

utils/tests/integration/concrete/comptroller/initialize/initialize.t.sol

@@ -2,7 +2,7 @@
 pragma solidity >=0.8.22;
 
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/src/Upgrades.sol";
+import { UnsafeUpgrades } from "openzeppelin-foundry-upgrades/src/Upgrades.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
 import { ISablierComptroller } from "src/interfaces/ISablierComptroller.sol";