From c6c4cb109c43582d99ec8fa07584e75cc73a18e5 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 11 Dec 2024 14:54:20 +0100 Subject: [PATCH] maybe fix ci --- .github/workflows/l1-contracts-ci.yaml | 4 ++-- l1-contracts/foundry.toml | 2 +- l1-contracts/hardhat.config.ts | 2 +- l2-contracts/foundry.toml | 2 +- l2-contracts/hardhat.config.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/l1-contracts-ci.yaml b/.github/workflows/l1-contracts-ci.yaml index ec546bb5c..46ff536b6 100644 --- a/.github/workflows/l1-contracts-ci.yaml +++ b/.github/workflows/l1-contracts-ci.yaml @@ -161,7 +161,7 @@ jobs: echo "$PWD/foundry-zksync" >> $GITHUB_PATH - name: Install dependencies - run: yarn + run: ci_run yarn - name: Build system contract artifacts run: yarn sc build:foundry @@ -175,7 +175,7 @@ jobs: da-contracts/out l1-contracts/cache-forge l1-contracts/out - l1-contracts/zkout + # TODO: cached `zkout` and the one for tests produce different hashes and so it causes the tests to fail l2-contracts/cache-forge l2-contracts/zkout system-contracts/zkout diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 2dd32c36b..84614c12c 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -42,4 +42,4 @@ optimizer = true optimizer_runs = 200 [profile.default.zksync] enable_eravm_extensions = true -zksolc = "1.5.3" +zksolc = "1.5.7" diff --git a/l1-contracts/hardhat.config.ts b/l1-contracts/hardhat.config.ts index fc3ae18f1..931008a31 100644 --- a/l1-contracts/hardhat.config.ts +++ b/l1-contracts/hardhat.config.ts @@ -45,7 +45,7 @@ export default { }, zksolc: { compilerSource: "binary", - version: "1.5.3", + version: "1.5.7", settings: { isSystem: true, }, diff --git a/l2-contracts/foundry.toml b/l2-contracts/foundry.toml index b369e211f..cbc072ca8 100644 --- a/l2-contracts/foundry.toml +++ b/l2-contracts/foundry.toml @@ -24,4 +24,4 @@ fs_permissions = [ [profile.default.zksync] enable_eravm_extensions = true -zksolc = "1.5.3" +zksolc = "1.5.7" diff --git a/l2-contracts/hardhat.config.ts b/l2-contracts/hardhat.config.ts index 5aa44b527..073b0db2f 100644 --- a/l2-contracts/hardhat.config.ts +++ b/l2-contracts/hardhat.config.ts @@ -13,7 +13,7 @@ if (!process.env.CHAIN_ETH_NETWORK) { export default { zksolc: { - version: "1.5.3", + version: "1.5.7", compilerSource: "binary", settings: { isSystem: true,