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

Another Fix for Push Events & Skip More Steps #1209

Merged
merged 6 commits into from
Dec 28, 2023
Merged

Another Fix for Push Events & Skip More Steps #1209

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee339d9
Another fix
cameron-dunn-sublime Dec 28, 2023
326e0e9
Partially break rule
cameron-dunn-sublime Dec 28, 2023
53225ac
Break further
cameron-dunn-sublime Dec 28, 2023
71219b4
more
cameron-dunn-sublime Dec 28, 2023
a7f6110
address grouping & skip more steps
cameron-dunn-sublime Dec 28, 2023
a189026
revert rule
cameron-dunn-sublime Dec 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
18 changes: 11 additions & 7 deletions .github/workflows/rule-validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:

concurrency:
# For pull_request_target workflows we want to use head_ref -- the branch triggering the workflow. Otherwise,
# use ref, which is the branch for a push event.
group: ${{ github.event_name == 'pull_request_target' && github.head_ref || github.ref }}
# use ref, which is the branch for a push event or workflow trigger. And for an issue comment just give up grouping.
group: ${{ github.event_name == 'pull_request_target' && github.head_ref || (github.event_name == 'issue_comment' && github.run_id || github.ref) }}
cancel-in-progress: ${{ github.event_name == 'pull_request_target' }}

jobs:
Expand All @@ -38,15 +38,13 @@ jobs:
- name: Get Refs
id: get_head_ref
run: |
# Accurate for push events, other events require changes.
head_ref="${{ github.head_ref }}"
# Accurate for push events & workflow dispatch.
head_ref="${{ github.ref }}"
repo="${{ github.repository }}"

if [[ "${{ github.event_name }}" == 'pull_request_target' ]]; then
head_ref="${{ github.head_ref }}"
repo="${{ github.event.pull_request.head.repo.full_name }}"
elif [[ "${{ github.event_name }}" == 'workflow_dispatch' ]]; then
# Run on a target, so run for all rules.
run_all="true"
elif [[ "${{ github.event_name }}" == 'issue_comment' ]]; then
# Rely on comment_branch to figure out the head and base
head_ref="${{ steps.comment_branch.outputs.head_ref }}"
Expand Down Expand Up @@ -91,12 +89,14 @@ jobs:
python-version: '3.10'

- name: Add Rule IDs as Needed & Check for Duplicates
if: github.event_name != 'issue_comment'
# Run before testing, just in case this could invalidate the rule itself
run: |
pip install -r scripts/generate-rule-ids/requirements.txt
python scripts/generate-rule-ids/main.py

- name: Validate Rules
if: github.event_name != 'issue_comment'
run: |
for f in *-rules/*.yml
do
Expand All @@ -111,6 +111,7 @@ jobs:
done

- name: Validate Insights and Signals
if: github.event_name != 'issue_comment'
run: |
for f in {insights,signals}/**/*.yml
do
Expand All @@ -125,15 +126,18 @@ jobs:
done

- name: Verify no .yaml files exist
if: github.event_name != 'issue_comment'
run: |
! /bin/sh -c 'ls **/*.yaml'


- name: Verify no .yml files exist in the top directory
if: github.event_name != 'issue_comment'
run: |
! /bin/sh -c 'ls *.yml'

- name: Commit & Push Results, if needed
if: github.event_name != 'issue_comment'
id: final_basic_validation
run: |
rm response.txt
Expand Down
Loading