diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml index f3418a539e9..380afdfbcfc 100644 --- a/.github/workflows/sync-main.yml +++ b/.github/workflows/sync-main.yml @@ -16,6 +16,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Git config shell: bash run: | @@ -25,12 +27,13 @@ jobs: shell: bash run: | set -x - git fetch + git fetch --unshallow git remote add upstream https://github.com/github/codeql.git - git fetch upstream --tags --force + git fetch upstream --unshallow --tags --force - name: Sync Main shell: bash run: | + git log --oneline -20 git merge codeql-cli/latest git push origin main git push origin --tags --force