From 4b869aa5f48c491f2577e09e00d98f081bd857f9 Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:42:28 +0100 Subject: [PATCH 1/3] ci: fix exclude keyword --- .github/workflows/solidity.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index 19d0d643a1..85a45b3af2 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -129,9 +129,9 @@ jobs: fail-fast: false matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} - # Slither is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + # Slither is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts + exclude: + - package: solidity-devops permissions: # always required security-events: write @@ -246,8 +246,8 @@ jobs: matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} # Gas diff is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + exclude: + - package: solidity-devops steps: - uses: actions/checkout@v4 with: @@ -296,9 +296,9 @@ jobs: fail-fast: false matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} - # Size check is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + # Size check is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts + exclude: + - package: solidity-devops steps: - uses: actions/checkout@v4 with: From 7c298ac1ecc7a43f80d81eed51c77616c4025d94 Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:43:40 +0100 Subject: [PATCH 2/3] ci: try adding no-op benchmark tests --- packages/contracts-core/test/GasBenchmark.t.sol | 10 ++++++++++ packages/solidity-devops/test/GasBenchmark.t.sol | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/contracts-core/test/GasBenchmark.t.sol create mode 100644 packages/solidity-devops/test/GasBenchmark.t.sol diff --git a/packages/contracts-core/test/GasBenchmark.t.sol b/packages/contracts-core/test/GasBenchmark.t.sol new file mode 100644 index 0000000000..69cad344db --- /dev/null +++ b/packages/contracts-core/test/GasBenchmark.t.sol @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; + +import {Test} from "forge-std/Test.sol"; + +/// @notice No gas benchmark is required for contracts-core +contract GasBenchmarkTest is Test { + // solhint-disable-next-line no-empty-blocks + function testGasBenchmark() public {} +} diff --git a/packages/solidity-devops/test/GasBenchmark.t.sol b/packages/solidity-devops/test/GasBenchmark.t.sol new file mode 100644 index 0000000000..abbe968443 --- /dev/null +++ b/packages/solidity-devops/test/GasBenchmark.t.sol @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; + +import {Test} from "forge-std/Test.sol"; + +/// @notice No gas benchmark is required for solidity-devops +contract GasBenchmarkTest is Test { + // solhint-disable-next-line no-empty-blocks + function testGasBenchmark() public {} +} From 3cf20c3673a690e7fe69dbda0008d0bc4adf975a Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:48:37 +0100 Subject: [PATCH 3/3] Revert "ci: fix exclude keyword" This reverts commit 4b869aa5f48c491f2577e09e00d98f081bd857f9. --- .github/workflows/solidity.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index 85a45b3af2..19d0d643a1 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -129,9 +129,9 @@ jobs: fail-fast: false matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} - # Slither is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + # Slither is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts + exclude: + - package: solidity-devops permissions: # always required security-events: write @@ -246,8 +246,8 @@ jobs: matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} # Gas diff is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + exclude: + - package: solidity-devops steps: - uses: actions/checkout@v4 with: @@ -296,9 +296,9 @@ jobs: fail-fast: false matrix: package: ${{ fromJson(needs.changes.outputs.packages) }} - # Size check is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts - exclude: - - package: solidity-devops + # Size check is irrelevant for solidity-devops, as it only contains devops scripts rather than deployed contracts + exclude: + - package: solidity-devops steps: - uses: actions/checkout@v4 with: