@@ -29,14 +29,14 @@ jobs:
29
29
run : |
30
30
git config user.name "github-actions[bot]"
31
31
git config user.email "github-actions[bot]@users.noreply.github.com"
32
- git checkout -B sync-main-pr origin/sync-main-pr
32
+ git checkout -B auto/ sync-main-pr origin/auto /sync-main-pr
33
33
- name : Sync origin/main
34
34
shell : bash
35
35
run : |
36
36
echo "::group::Sync with main branch"
37
- git pull origin sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi
37
+ git pull origin auto/ sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi
38
38
git pull origin main
39
- git push --force origin sync-main-pr
39
+ git push --force origin auto/ sync-main-pr
40
40
echo "::endgroup::"
41
41
- name : Sync upstream/codeql-cli/latest
42
42
shell : bash
@@ -52,18 +52,15 @@ jobs:
52
52
echo "::endgroup::"
53
53
- name : Push sync branch
54
54
run : |
55
- git push origin sync-main-pr
55
+ git push origin auto/ sync-main-pr
56
56
env :
57
57
GH_TOKEN : ${{ secrets.WORKFLOW_TOKEN }}
58
- GITHUB_TOKEN : ${{ secrets.WORKFLOW_TOKEN }}
59
58
- name : Create or update PR
60
59
run : |
61
- if gh pr list --repo microsoft/codeql --head sync-main-pr --base main --json number --jq '.[0].number' > /dev/null; then
62
- echo "PR from sync-main-pr to main already exists. Exiting gracefully."
60
+ if gh pr list --repo microsoft/codeql --head auto/ sync-main-pr --base main --json number --jq '.[0].number' > /dev/null; then
61
+ echo "PR from auto/ sync-main-pr to main already exists. Exiting gracefully."
63
62
else
64
- gh pr create --repo microsoft/codeql --fill -B main -H sync-main-pr --title 'Sync Main' --body "This PR syncs the latest changes from \`codeql-cli/latest\` into \`main\`."
63
+ gh pr create --repo microsoft/codeql --fill -B main -H auto/ sync-main-pr --label 'autogenerated' -- title 'Sync Main (autogenerated) ' --body "This PR syncs the latest changes from \`codeql-cli/latest\` into \`main\`."
65
64
fi
66
65
env :
67
66
GH_TOKEN : ${{ secrets.WORKFLOW_TOKEN }}
68
- GITHUB_TOKEN : ${{ secrets.WORKFLOW_TOKEN }}
69
-
0 commit comments