Skip to content

Commit

Permalink
workflow fix
Browse files Browse the repository at this point in the history
  • Loading branch information
orouz committed Mar 13, 2024
1 parent f7b4dd6 commit 026d47b
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions scripts/sync_rule_templates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,12 @@ changelog_path="packages/cloud_security_posture/changelog.yml"
cd ../integrations
if git fetch origin main "$branch_name" &>/dev/null; then
git checkout "$branch_name"
git reset origin/main --hard # reset to main, avoids conflicts
else
git checkout -b "$branch_name" origin/main
fi

# avoid rebase conflicts in manifest/changelog files and rule templates
git checkout origin/main -- "$manifest_path" "$changelog_path"
git rebase origin/main

# avoid multiple manifest/changelog commits
git reset origin/main

# run the script to generate the rule templates
# generate the rule templates
cd ../cloudbeat
poetry run -C security-policies python security-policies/dev/generate_rule_templates.py

Expand Down

0 comments on commit 026d47b

Please sign in to comment.