From f57e451bde5464c50271dc1d10d6609d1fd864b4 Mon Sep 17 00:00:00 2001
From: miguelmtzinf <miguelmtz.mail@gmail.com>
Date: Thu, 6 Jun 2024 16:40:37 +0200
Subject: [PATCH] ci: Remove unneeded ci actions

---
 .github/workflows/build.yml.bak            | 40 ---------------
 .github/workflows/certora.yml              | 16 +-----
 .github/workflows/solidity-foundry.yml.bak | 58 ----------------------
 .gitmodules                                |  3 ++
 contracts/remappings.txt                   |  2 +-
 5 files changed, 6 insertions(+), 113 deletions(-)
 delete mode 100644 .github/workflows/build.yml.bak
 delete mode 100644 .github/workflows/solidity-foundry.yml.bak

diff --git a/.github/workflows/build.yml.bak b/.github/workflows/build.yml.bak
deleted file mode 100644
index 27185ccbd5..0000000000
--- a/.github/workflows/build.yml.bak
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build
-
-on: push
-
-# workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      FOUNDRY_PROFILE: 'ccip'
-    # strategy:
-    #   matrix:
-    #     node-version:
-    #       - 16.x
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Setup NodeJS
-        uses: ./.github/actions/setup-nodejs
-        with:
-          prod: "true"
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-      - name: Install Dependencies
-        run: |
-          cd contracts
-          npm i
-          forge i
-      - name: Compilation
-        run: 'forge b'
-      - name: Lint check
-        run: 'npm run prettier:check'
-      - name: Test
-        run: 'npm run test'
diff --git a/.github/workflows/certora.yml b/.github/workflows/certora.yml
index e3a89ebf27..7a2c63b81a 100644
--- a/.github/workflows/certora.yml
+++ b/.github/workflows/certora.yml
@@ -1,18 +1,6 @@
 name: certora
 
-on:
-  push:
-    branches:
-      - main
-      - certora
-      - ccip-gho
-  pull_request:
-    branches:
-      - main
-      - certora
-      - ccip-gho
-
-  workflow_dispatch:
+on: push
 
 jobs:
   verify:
@@ -29,7 +17,7 @@ jobs:
 
       - name: Install java
         uses: actions/setup-java@v1
-        with: { java-version: '11', java-package: jre }
+        with: { java-version: "11", java-package: jre }
 
       - name: Install certora cli
         run: pip install certora-cli==7.6.3
diff --git a/.github/workflows/solidity-foundry.yml.bak b/.github/workflows/solidity-foundry.yml.bak
deleted file mode 100644
index 9a9fe07e5e..0000000000
--- a/.github/workflows/solidity-foundry.yml.bak
+++ /dev/null
@@ -1,58 +0,0 @@
-name: foundry
-
-on: push
-
-env:
-  FOUNDRY_PROFILE: ci
-
-jobs:
-  tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        product: [ccip]
-    needs: [changes]
-    name: Foundry Tests ${{ matrix.product }}
-    # See https://github.com/foundry-rs/foundry/issues/3827
-    runs-on: ubuntu-22.04
-
-    # The if statements for steps after checkout repo is workaround for
-    # passing required check for PRs that don't have filtered changes.
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          submodules: recursive
-
-      # Only needed because we use the NPM versions of packages
-      # and not native Foundry. This is to make sure the dependencies
-      # stay in sync.
-      - name: Setup NodeJS
-        if: needs.changes.outputs.changes == 'true'
-        uses: ./.github/actions/setup-nodejs
-
-      - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          # Has to match the `make foundry` version.
-          version: nightly-2cb875799419c907cc3709e586ece2559e6b340e
-
-      - name: Run Forge build
-        if: needs.changes.outputs.changes == 'true'
-        run: |
-          forge --version
-          forge build
-        id: build
-        working-directory: contracts
-        env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
-
-      - name: Run Forge tests
-        if: needs.changes.outputs.changes == 'true'
-        run: |
-          forge test -vvv
-        id: test
-        working-directory: contracts
-        env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
diff --git a/.gitmodules b/.gitmodules
index 21fec76324..a8b5a9aeaf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "contracts/foundry-lib/solidity-utils"]
 	path = contracts/foundry-lib/solidity-utils
 	url = https://github.com/bgd-labs/solidity-utils
+[submodule "contracts/foundry-lib/gho-core"]
+	path = contracts/foundry-lib/gho-core
+	url = https://github.com/aave/gho-core
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
index 8fbfa33413..665a6d78a0 100644
--- a/contracts/remappings.txt
+++ b/contracts/remappings.txt
@@ -6,5 +6,5 @@ forge-std/=foundry-lib/forge-std/src/
 hardhat/=node_modules/hardhat/
 @eth-optimism/=node_modules/@eth-optimism/
 @scroll-tech/=node_modules/@scroll-tech/
-@aave/gho-core/=node_modules/@aave/gho/src/contracts/
+@aave/gho-core/=foundry-lib/gho-core/src/contracts/
 solidity-utils/=foundry-lib/solidity-utils/src/