From d6154241ed9061327bb5ff5bfcaf4337bcadfb3a Mon Sep 17 00:00:00 2001
From: Pepper Lebeck-Jobe <eljobe@gmail.com>
Date: Mon, 6 May 2024 16:11:33 +0200
Subject: [PATCH 1/3] Fix the nitro CI builds.

For some reason, the master branch of nitro won't build the contracts
if there are any remappings specified for a yul build.

This change removes the remappings for the yul build.
---
 foundry.toml   | 4 +++-
 remappings.txt | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 remappings.txt

diff --git a/foundry.toml b/foundry.toml
index 774b6a24f..e45c847db 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -14,8 +14,10 @@ src = 'yul'
 out = 'out/yul'
 libs = ['node_modules', 'lib']
 cache_path  = 'forge-cache/yul'
+remappings = []
+auto_detect_remappings = false
 
 [fmt]
 number_underscore = 'thousands'
 line_length = 100
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
\ No newline at end of file
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/remappings.txt b/remappings.txt
deleted file mode 100644
index f02afee28..000000000
--- a/remappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-
-@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
\ No newline at end of file

From c36913f4f82e21a0ae1aedc9565c950bb3e1fa82 Mon Sep 17 00:00:00 2001
From: gzeon <im@gzeon.dev>
Date: Tue, 7 May 2024 00:21:57 +1000
Subject: [PATCH 2/3] chore: keep static remapping

---
 foundry.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/foundry.toml b/foundry.toml
index e45c847db..b8918c768 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -8,6 +8,7 @@ optimizer = true
 optimizer_runs = 20000
 via_ir = false
 solc_version = '0.8.9'
+remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/','forge-std/=lib/forge-std/src/','@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/','@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/']
 
 [profile.yul]
 src = 'yul'

From b9e21f0da1d06446dd7fb58e742c2c1adb10b375 Mon Sep 17 00:00:00 2001
From: gzeon <im@gzeon.dev>
Date: Tue, 7 May 2024 00:27:46 +1000
Subject: [PATCH 3/3] format: remappings

---
 foundry.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/foundry.toml b/foundry.toml
index 5182f5b5c..1bb66e837 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -8,7 +8,10 @@ optimizer = true
 optimizer_runs = 100
 via_ir = false
 solc_version = '0.8.9'
-remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/','forge-std/=lib/forge-std/src/','@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/','@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/']
+remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
+              'forge-std/=lib/forge-std/src/',
+              '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
+              '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/']
 
 [profile.yul]
 src = 'yul'