Merge pull request #4 from OriginProtocol/clement/fix-CI

Fix CI.
OriginProtocol · Jul 19, 2024 · 4397dbf · 4397dbf
2 parents 12a0509 + df381df
commit 4397dbf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
     types: [opened, reopened, synchronize]
   push:
     branches:
-      - 'master'
+      - 'main'
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/script/deploy/DeployManager.sol b/script/deploy/DeployManager.sol
@@ -139,20 +139,28 @@ contract DeployManager is Script {
                 deployedContracts[name] = addr;
             }
 
-            // Sleep 0.5s so that the previous write is complete
-            vm.sleep(500);
-            vm.writeJson(networkDeployments, deploymentsFilePath, contractsKey);
-            console.log("> Deployment addresses stored.");
-
             /**
              * Write Execution History
              */
             currentExecutions = vm.serializeUint(executionsKey, deployScript.DEPLOY_NAME(), block.timestamp);
 
-            // Sleep 0.5s so that the previous write is complete
-            vm.sleep(500);
-            vm.writeJson(currentExecutions, deploymentsFilePath, executionsKey);
-            console.log("> Deploy script execution complete.");
+            // Write to file instead of using writeJson to avoid "EOF while parsing a value at line 1 column 0" error.
+            vm.writeFile(
+                getForkDeploymentFilePath(),
+                string(
+                    abi.encodePacked(
+                        '{ "',
+                        chainIdStr,
+                        '": { "executions": ',
+                        currentExecutions,
+                        ', "contracts": ',
+                        networkDeployments,
+                        "}}"
+                    )
+                )
+            );
+
+            console.log("> Deployment addresses stored and Deploy script execution complete.");
         }
     }
 

diff --git a/test/OethLiquidityManager.t.sol b/test/OethLiquidityManager.t.sol
@@ -46,6 +46,8 @@ contract OethLiquidityManagerTest is AbstractForkTest {
 
         vault.addWithdrawalQueueLiquidity();
 
+        skip(10 minutes);
+
         // Claim the ETH.
         oethARM.claimWithdrawal(requestId);