Skip to content

Policy update: Sync-Main Create PR (instead of direct push) #187

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

Merged
dilanbhalla merged 3 commits into from
Apr 4, 2025
Merged

Policy update: Sync-Main Create PR (instead of direct push) #187

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6da7e4c
Update sync-main.yml
dilanbhalla Apr 4, 2025
e0b8e20
Update sync-main.yml
dilanbhalla Apr 4, 2025
2af5513
Update sync-main.yml
dilanbhalla Apr 4, 2025
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
42 changes: 30 additions & 12 deletions .github/workflows/sync-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Sync Main

on:
schedule:
- cron: '55 * * * *'

jobs:

sync-main:

name: Sync-main
runs-on: ubuntu-latest
if: github.repository == 'microsoft/codeql'
permissions:
contents: write
pull-requests: write

steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -18,16 +24,17 @@ jobs:
- name: Git config
shell: bash
run: |
git config user.name Dilan Bhalla
git config user.email [email protected]
- name: Sync Main
shell: bash
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
- name: Add and fetch upstream
run: |
set -x
git fetch
git remote add upstream https://github.com/github/codeql.git
git fetch upstream --tags --force
git merge codeql-cli/latest
- name: Create or reset sync branch
run: |
git fetch origin sync-main-pr || true
git checkout -B sync-main-pr origin/main
git merge upstream/codeql-cli/latest --no-edit || true
- name: Setup CodeQL
shell: bash
run: |
Expand All @@ -41,9 +48,20 @@ jobs:
- name: Compile PowerShell Queries
run: |
codeql query compile --check-only --keep-going powershell/ql/src
- name: Complete Sync
shell: bash
- name: Push sync branch
run: |
git push origin main
git push origin --tags --force

git push origin sync-main-pr --force
- name: Create or update PR
run: |
PR_URL=$(gh pr list --head sync-main-pr --json url --jq '.[0].url')
if [ -z "$PR_URL" ]; then
gh pr create \
--title "Automated sync from upstream" \
--body "This PR syncs the latest changes from \`codeql-cli/latest\` into \`main\`." \
--head sync-main-pr \
--base main
else
echo "PR already exists: $PR_URL"
fi
env:
GITHUB_TOKEN: ${{ github.token }}
Loading