Merge pull request #11 from mirooon/test8

d
mirooon · Feb 18, 2025 · faa26db · faa26db
2 parents 3cecdf4 + ae0b3e3
commit faa26db
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 212 deletions.
diff --git a/.github/workflows/securityAlertsReview.yml b/.github/workflows/securityAlertsReview.yml
@@ -35,13 +35,15 @@ jobs:
         run: |
           echo "Checking latest Olympix Static Analysis run for branch: $BRANCH_NAME"
 
-          # Fetch the latest completed run of the Olympix Static Analysis workflow for this branch
+          # Fetch the latest completed runs of the Olympix Static Analysis workflow
           LATEST_RUN=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
-            "https://api.github.com/repos/${{ github.repository }}/actions/workflows/olympixStaticAnalysis.yml/runs?status=completed&branch=${BRANCH_NAME}&per_page=1")
+            "https://api.github.com/repos/${{ github.repository }}/actions/workflows/olympixStaticAnalysis.yml/runs?status=completed&per_page=10")
 
           echo "LATEST_RUN:"
           echo "$LATEST_RUN"
-          WORKFLOW_STATUS=$(echo "$LATEST_RUN" | jq -r '.workflow_runs[0].conclusion')
+
+          # Filter to find the first run with head_branch matching our branch name
+          WORKFLOW_STATUS=$(echo "$LATEST_RUN" | jq -r --arg branch "$BRANCH_NAME" '.workflow_runs[] | select(.head_branch == $branch) | .conclusion' | head -n1)
           echo "WORKFLOW_STATUS:"
           echo "$WORKFLOW_STATUS"
 
@@ -50,6 +52,7 @@ jobs:
             echo "The Security Alerts Review workflow cannot continue because a valid Olympix Static Analysis report is required."
             exit 1
           fi
+
       - name: Fetch PR Number
         id: fetch_pr
         env:

diff --git a/src/Facets/OmniBridgeFacetNewNew.sol → src/Facets/OmniBridgeFacet2.sol b/src/Facets/OmniBridgeFacetNewNew.sol → src/Facets/OmniBridgeFacet2.sol
@@ -12,7 +12,7 @@ import { Validatable } from "../Helpers/Validatable.sol";
 /// @author LI.FI (https://li.fi)
 /// @notice Provides functionality for bridging through OmniBridge
 /// @custom:version 1.0.0
-contract OmniBridgeFacet is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
+contract OmniBridgeFacet2 is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
     /// Storage ///
 
     /// @notice The contract address of the foreign omni bridge on the source chain.

diff --git a/src/Facets/OmniBridgeFacetNewNewNew.sol b/src/Facets/OmniBridgeFacetNewNewNew.sol
diff --git a/src/Facets/OmniBridgeFacetNewNewNewNew.sol b/src/Facets/OmniBridgeFacetNewNewNewNew.sol