[AUTOPATCHER-kernel] Kernel CVE - branch 3.0-dev - CVE-2024-49914 CVE-2024-49917 CVE-2024-42122 CVE-2024-49915 CVE-2024-43911 CVE-2024-41080 CVE-2024-46841 CVE-2024-50067 CVE-2024-36972 CVE-2024-36910 CVE-2024-41071 CVE-2024-49906 CVE-2024-44955 CVE-2024-50010 CVE-2024-40965 CVE-2024-42252 CVE-2024-53085 CVE-2023-52601 CVE-2024-49974 CVE-2024-49911 CVE-2024-26875 CVE-2024-49899 CVE-2024-43835 CVE-2024-27011 CVE-2023-52920 CVE-2024-49897 CVE-2024-43913 CVE-2024-49909 CVE-2024-49926 CVE-2024-44950 CVE-2024-43904 CVE-2024-49898 CVE-2024-43857 CVE-2024-50027 CVE-2024-49891 CVE-2024-44963 CVE-2024-49934 CVE-2024-42156 #2488
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Copyright (c) Microsoft Corporation. | |
| # Licensed under the MIT License. | |
| name: Github Merge Conflict Check | |
| on: | |
| push: | |
| branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*] | |
| pull_request: | |
| branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*] | |
| jobs: | |
| spec-check: | |
| name: Github Merge Conflict Check | |
| runs-on: ubuntu-latest | |
| steps: | |
| # Checkout the branch of our repo that triggered this action | |
| - name: Workflow trigger checkout | |
| uses: actions/checkout@v4 | |
| - name: Get base commit for PRs | |
| if: ${{ github.event_name == 'pull_request' }} | |
| run: | | |
| git fetch origin ${{ github.base_ref }} | |
| echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV | |
| echo "Merging ${{ github.sha }} into ${{ github.base_ref }}" | |
| - name: Get base commit for Pushes | |
| if: ${{ github.event_name == 'push' }} | |
| run: | | |
| git fetch origin ${{ github.event.before }} | |
| echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV | |
| echo "Merging ${{ github.sha }} into ${{ github.event.before }}" | |
| - name: Check for merge conflicts | |
| run: | | |
| echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'" | |
| changed_files=$(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }}) | |
| merge_conflict_found=false | |
| for file in $changed_files ; do | |
| if [ -f $file ]; then | |
| echo "Checking for merge conflicts in $file" | |
| if grep -H -r "^<<<<<<< HEAD$" $file; then | |
| echo "Merge conflict found in $file" | |
| merge_conflict_found=true | |
| fi | |
| if grep -H -r "^>>>>>>>$" $file; then | |
| echo "Merge conflict found in $file" | |
| merge_conflict_found=true | |
| fi | |
| if grep -H -r "^=======$" $file; then | |
| echo "Merge conflict found in $file" | |
| merge_conflict_found=true | |
| fi | |
| fi | |
| done | |
| if [[ $merge_conflict_found =~ [Tt]rue ]]; then | |
| echo "Merge conflict found in one or more files" | |
| exit 1 | |
| fi |