From 8907a7151ca1a8fb7938ba181a0707d3c5754872 Mon Sep 17 00:00:00 2001
From: Paul Balaji <paul@hyperlane.xyz>
Date: Thu, 1 Feb 2024 18:17:09 +0000
Subject: [PATCH] feat: build head of PRs instead of merge commit (#3206)

---
 .github/workflows/agent-release-artifacts.yml |  2 +-
 .github/workflows/monorepo-docker.yml         |  1 +
 .github/workflows/rust-docker.yml             |  2 ++
 .github/workflows/rust.yml                    |  4 ++++
 .github/workflows/static-analysis.yml         |  1 +
 .github/workflows/storage-analysis.yml        |  2 +-
 .github/workflows/test.yml                    | 21 +++++++++++++------
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/agent-release-artifacts.yml b/.github/workflows/agent-release-artifacts.yml
index 79c421f22a..2827120989 100644
--- a/.github/workflows/agent-release-artifacts.yml
+++ b/.github/workflows/agent-release-artifacts.yml
@@ -49,7 +49,7 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq crossbuild-essential-arm64 crossbuild-essential-armhf
-          
+
           # some additional configuration for cross-compilation on linux
           cat >>~/.cargo/config <<EOF
           [target.aarch64-unknown-linux-gnu]
diff --git a/.github/workflows/monorepo-docker.yml b/.github/workflows/monorepo-docker.yml
index 9952c3507e..72a0fc1f1c 100644
--- a/.github/workflows/monorepo-docker.yml
+++ b/.github/workflows/monorepo-docker.yml
@@ -36,6 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
 
       - name: Generate tag data
diff --git a/.github/workflows/rust-docker.yml b/.github/workflows/rust-docker.yml
index 7c75426f97..1463d11a13 100644
--- a/.github/workflows/rust-docker.yml
+++ b/.github/workflows/rust-docker.yml
@@ -34,6 +34,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - name: Generate tag data
         id: taggen
         run: |
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5f13165d13..48caa1f773 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -28,6 +28,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -54,6 +56,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 147eb58779..5f14fc05b3 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -15,6 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
 
       - name: yarn-cache
diff --git a/.github/workflows/storage-analysis.yml b/.github/workflows/storage-analysis.yml
index 5032ccf884..f21d36ed63 100644
--- a/.github/workflows/storage-analysis.yml
+++ b/.github/workflows/storage-analysis.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout PR branch
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
 
       - uses: actions/setup-node@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 781e25b3ed..75d1e5bfb7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
 
       - name: yarn-cache
@@ -54,6 +55,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
           fetch-depth: 0
 
@@ -71,7 +73,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: build
         run: yarn build
@@ -82,6 +84,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           # check out full history
           fetch-depth: 0
 
@@ -111,6 +114,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
           fetch-depth: 0
 
@@ -123,7 +127,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Unit Tests
         run: yarn test:ci
@@ -134,6 +138,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
           fetch-depth: 0
 
@@ -151,7 +156,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Metadata Health Check
         run: yarn workspace @hyperlane-xyz/sdk run test:metadata
@@ -166,6 +171,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
 
       - name: foundry-install
@@ -205,7 +211,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: cargo-cache
         uses: actions/cache@v3
@@ -251,6 +257,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: foundry-install
         uses: onbjerg/foundry-toolchain@v1
@@ -261,7 +269,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Fork test ${{ matrix.environment }} ${{ matrix.module }} ${{ matrix.chain }} deployment
         run: cd typescript/infra && ./fork.sh ${{ matrix.environment }} ${{ matrix.module }} ${{ matrix.chain }}
@@ -273,6 +281,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
 
       - name: yarn-cache
@@ -289,7 +298,7 @@ jobs:
           path: |
             ./*
             !./rust
-          key: ${{ github.sha }}
+          key: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: foundry-install
         uses: onbjerg/foundry-toolchain@v1