From 39c3df6a78eb82d01a681263472239484473469c Mon Sep 17 00:00:00 2001 From: Karl Bartel Date: Wed, 27 Nov 2024 11:08:28 +0100 Subject: [PATCH 1/2] forkdiff: use celo10-upstream branch as base Using the branch name form our repo is easier to read and ensures that the corresponding commit hash is available, not matter what upstream does. --- .github/workflows/pages.yml | 2 +- fork.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 7e26fa340725..1527e2b6908d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - fetch-depth: 1000 # make sure to fetch the old commit we diff against + fetch-depth: 0 # make sure to fetch the old commit we diff against - name: Build forkdiff uses: "docker://protolambda/forkdiff:0.1.0" diff --git a/fork.yaml b/fork.yaml index da775b7691ae..5c5414ce6318 100644 --- a/fork.yaml +++ b/fork.yaml @@ -5,8 +5,8 @@ footer: | base: name: OP - url: https://github.com/ethereum-optimism/optimism - hash: 224c5fd65cb4e8204258291e74263c1e70466176 # tracks the last rebased commit + url: https://github.com/celo-org/optimism + ref: refs/remotes/origin/celo10-upstream fork: name: CELO url: https://github.com/celo-org/optimism From 9c20efe87d0c70fd7b8b9c1b02c304189b4ad4f1 Mon Sep 17 00:00:00 2001 From: Karl Bartel Date: Wed, 27 Nov 2024 11:10:13 +0100 Subject: [PATCH 2/2] forkdiff: Allow manually triggering GH action This is nice for testing the action without having to merge a PR. --- .github/workflows/pages.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 1527e2b6908d..075443e414da 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -5,6 +5,9 @@ on: push: branches: - celo[0-9]+ + + workflow_dispatch: + jobs: deploy: concurrency: ci-${{ github.ref }}