Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only enforce ctf version on merge_group push to develop #11389

Merged
merged 8 commits into from
Nov 29, 2023
Merged

Only enforce ctf version on merge_group push to develop #11389

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ad897c
Only enforce ctf version on merge_group push to develop
tateexon Nov 27, 2023
a47b4f5
add debug echo to see what was missed
tateexon Nov 28, 2023
c7e5184
Merge branch 'develop' into ctf_version_required_check_on_merge_queue
tateexon Nov 28, 2023
1334270
Updated with refernences to merge_group payload instead of pull_reque…
tateexon Nov 28, 2023
9fb0979
Merge branch 'develop' into ctf_version_required_check_on_merge_queue
tateexon Nov 28, 2023
0569234
use output and test that we can indeed do this in a fail situation so…
tateexon Nov 28, 2023
5611227
Merge branch 'develop' into ctf_version_required_check_on_merge_queue
tateexon Nov 28, 2023
830721e
The test worked, flip back to enforcing only for merge groups to develop
tateexon Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,23 @@ jobs:
steps:
- name: Checkout the repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Check Merge Group Condition
id: condition-check
run: |
echo "Checking event condition..."
SHOULD_ENFORCE="false"
if [[ "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
echo "We are in a merge_group event, now check if we are on the develop branch"
target_branch=$(cat $GITHUB_EVENT_PATH | jq -r .merge_group.base_ref)
if [[ "$target_branch" == "refs/heads/develop" ]]; then
echo "We are on the develop branch, we should enforce ctf version"
SHOULD_ENFORCE="true"
fi
fi
echo "should we enforce ctf version = $SHOULD_ENFORCE"
echo "should-enforce=$SHOULD_ENFORCE" >> $GITHUB_ENV
- name: Enforce CTF Version
if: steps.condition-check.outputs.should-enforce == 'true'
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
with:
go-project-path: ./integration-tests
Expand Down
Loading