From 7267a1baeb4b84f950a282f724411e07661d5b30 Mon Sep 17 00:00:00 2001 From: Michael Sun Date: Thu, 12 Sep 2024 13:33:50 -0400 Subject: [PATCH] fix: ci --- .github/workflows/coverage.yml | 23 ++++++++++--------- .../scripts/core/verifyDelegationManager.sh | 2 +- certora/scripts/core/verifyStrategyManager.sh | 2 +- .../libraries/verifyStructuredLinkedList.sh | 2 +- certora/scripts/permissions/verifyPausable.sh | 2 +- certora/scripts/pods/verifyEigenPod.sh | 2 +- certora/scripts/pods/verifyEigenPodManager.sh | 2 +- .../scripts/strategies/verifyStrategyBase.sh | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6b57199f63..71f7eeb865 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -26,19 +26,20 @@ jobs: id: get_issue_number with: script: | - if (context.issue && context.issue.number) { - // Return issue number if present - return context.issue.number; + let issue_number; + // Attempt to find a pull request associated with the commit + const pullRequests = await github.rest.repos.listPullRequestsAssociatedWithCommit({ + commit_sha: context.sha, + owner: context.repo.owner, + repo: context.repo.repo, + }); + + if (pullRequests.data.length > 0) { + issue_number = pullRequests.data[0].number; } else { - // Otherwise return issue number from commit - return ( - await github.rest.repos.listPullRequestsAssociatedWithCommit({ - commit_sha: context.sha, - owner: context.repo.owner, - repo: context.repo.repo, - }) - ).data[0].number; + throw new Error('No associated issue or pull request found.'); } + return issue_number; result-encoding: string - name: Checkout code uses: actions/checkout@v2 diff --git a/certora/scripts/core/verifyDelegationManager.sh b/certora/scripts/core/verifyDelegationManager.sh index 678b5a37cc..dfec2c904e 100644 --- a/certora/scripts/core/verifyDelegationManager.sh +++ b/certora/scripts/core/verifyDelegationManager.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -solc-select use 0.8.12 +solc-select use 0.8.27 certoraRun certora/harnesses/DelegationManagerHarness.sol \ lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol lib/openzeppelin-contracts/contracts/mocks/ERC1271WalletMock.sol \ diff --git a/certora/scripts/core/verifyStrategyManager.sh b/certora/scripts/core/verifyStrategyManager.sh index 7f3b1c5d2a..5695ab7858 100644 --- a/certora/scripts/core/verifyStrategyManager.sh +++ b/certora/scripts/core/verifyStrategyManager.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -solc-select use 0.8.12 +solc-select use 0.8.27 certoraRun certora/harnesses/StrategyManagerHarness.sol \ lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol lib/openzeppelin-contracts/contracts/mocks/ERC1271WalletMock.sol \ diff --git a/certora/scripts/libraries/verifyStructuredLinkedList.sh b/certora/scripts/libraries/verifyStructuredLinkedList.sh index c03c593d40..25615e4e06 100644 --- a/certora/scripts/libraries/verifyStructuredLinkedList.sh +++ b/certora/scripts/libraries/verifyStructuredLinkedList.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -solc-select use 0.8.12 +solc-select use 0.8.27 certoraRun certora/harnesses/StructuredLinkedListHarness.sol \ --verify StructuredLinkedListHarness:certora/specs/libraries/StructuredLinkedList.spec \ diff --git a/certora/scripts/permissions/verifyPausable.sh b/certora/scripts/permissions/verifyPausable.sh index c9d23f965f..29cc4c1ad5 100644 --- a/certora/scripts/permissions/verifyPausable.sh +++ b/certora/scripts/permissions/verifyPausable.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -solc-select use 0.8.12 +solc-select use 0.8.27 certoraRun certora/harnesses/PausableHarness.sol \ src/contracts/permissions/PauserRegistry.sol \ diff --git a/certora/scripts/pods/verifyEigenPod.sh b/certora/scripts/pods/verifyEigenPod.sh index d4bc140a80..e4d7fedb81 100644 --- a/certora/scripts/pods/verifyEigenPod.sh +++ b/certora/scripts/pods/verifyEigenPod.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -# solc-select use 0.8.12 +# solc-select use 0.8.27 # certoraRun certora/harnesses/EigenPodHarness.sol \ # src/contracts/core/DelegationManager.sol src/contracts/pods/EigenPodManager.sol \ diff --git a/certora/scripts/pods/verifyEigenPodManager.sh b/certora/scripts/pods/verifyEigenPodManager.sh index 428f89ba33..9b4a621069 100644 --- a/certora/scripts/pods/verifyEigenPodManager.sh +++ b/certora/scripts/pods/verifyEigenPodManager.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -# solc-select use 0.8.12 +# solc-select use 0.8.27 # certoraRun certora/harnesses/EigenPodManagerHarness.sol \ # src/contracts/core/DelegationManager.sol src/contracts/pods/EigenPod.sol src/contracts/strategies/StrategyBase.sol src/contracts/core/StrategyManager.sol \ diff --git a/certora/scripts/strategies/verifyStrategyBase.sh b/certora/scripts/strategies/verifyStrategyBase.sh index 5c3d2683f5..58514d0dc8 100644 --- a/certora/scripts/strategies/verifyStrategyBase.sh +++ b/certora/scripts/strategies/verifyStrategyBase.sh @@ -3,7 +3,7 @@ then RULE="--rule $2" fi -solc-select use 0.8.12 +solc-select use 0.8.27 certoraRun src/contracts/strategies/StrategyBase.sol \ lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol \