Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ava-labs/coreth into sync-subnet-…
Browse files Browse the repository at this point in the history
…evm-branch
  • Loading branch information
darioush committed Aug 21, 2024
2 parents 1dad2f8 + fa5daaa commit d147327
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/sync-subnet-evm-branch.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
name: "Sync Subnet EVM Branch"
on:
push:
branches:
- sync-subnet-evm-branch # Hack to trigger workflow
workflow_dispatch:
inputs:
remoteBranch:
description: "Subnet EVM Branch"
required: true
default: "coreth-test-0"

jobs:
sync_branch:
Expand All @@ -27,9 +25,9 @@ jobs:
# TODO: Can use default when we remove the push trigger hack
# TODO: Replace test branch with actual (eg, coreth)
- name: Fetch Remote Branch (${{ github.events.inputs.remoteBranch || 'coreth-test-0' }})
- name: Fetch Remote Branch (${{ github.event.inputs.remoteBranch }})
run: |
git fetch subnet-evm ${{ github.events.inputs.remoteBranch || 'coreth-test-0' }}
git fetch subnet-evm ${{ github.event.inputs.remoteBranch }}
git fetch subnet-evm coreth-diff-script
git branch -a # Verify the new branch was fetched
Expand All @@ -40,7 +38,7 @@ jobs:
- name: Apply diff
run: |
./scripts/apply_diff_and_rename.sh subnet-evm/${{ github.events.inputs.remoteBranch || 'coreth-test-0' }}
./scripts/apply_diff_and_rename.sh subnet-evm/${{ github.event.inputs.remoteBranch }}
# TODO: Should this step be removed?
- name: Restore .github/workflows
Expand All @@ -56,4 +54,4 @@ jobs:
title: "Sync Subnet EVM"
body: |
This PR was created automatically by a GitHub Action.
draft: true
draft: true

0 comments on commit d147327

Please sign in to comment.