Merge pull request #137 from liquity/define-ci

ci: define the CI env var when running in CI
liquity · Apr 30, 2024 · 5b5836c · 5b5836c
2 parents 72fc823 + 6cfaa81
commit 5b5836c
Show file tree

Hide file tree

Showing 4 changed files with 9,514 additions and 13,561 deletions.
diff --git a/.github/workflows/contracts-tests.yml b/.github/workflows/contracts-tests.yml
@@ -90,7 +90,7 @@ jobs:
           cache-dependency-path: "pnpm-lock.yaml"
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -151,7 +151,7 @@ jobs:
           cache-dependency-path: "pnpm-lock.yaml"
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: harhdat coverage
         run: pnpm coverage

diff --git a/.github/workflows/testnet-deployment.yml b/.github/workflows/testnet-deployment.yml
@@ -18,6 +18,7 @@ on:
       - "contracts/**"
 
 env:
+  CI: true
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   FOUNDRY_VERSION: nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9
 
@@ -48,7 +49,7 @@ jobs:
           cache-dependency-path: "pnpm-lock.yaml"
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
         working-directory: ./contracts
 
       - name: Install Foundry
@@ -85,7 +86,7 @@ jobs:
           version: 8
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Install Vercel CLI
         run: pnpm install --global vercel@canary
@@ -138,7 +139,7 @@ jobs:
           version: 8
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Install Vercel CLI
         run: pnpm install --global vercel@canary

diff --git a/contracts/utils/deploy-cli.ts b/contracts/utils/deploy-cli.ts
@@ -141,16 +141,19 @@ Deploying Liquity contracts with the following settings:
   VERIFIER_URL:       ${options.verifierUrl}
 `;
 
-  const envVars = [
-    `DEPLOYER=${options.deployer}`,
-  ];
+  process.env.DEPLOYER = options.deployer;
 
   if (options.openDemoTroves) {
-    envVars.push("OPEN_DEMO_TROVES=true");
+    process.env.OPEN_DEMO_TROVES = "true";
+  }
+
+  if ("CI" in process.env) {
+    echo("Workaround: deleting variable 'CI' from environment"); // See https://github.com/liquity/bold/pull/113
+    delete process.env.CI;
   }
 
   // deploy
-  await $`${envVars} forge ${forgeArgs}`;
+  await $`forge ${forgeArgs}`;
 
   const deployedContracts = await getDeployedContracts(
     `broadcast/DeployLiquity2.s.sol/${options.chainId}/run-latest.json`,