Fix conflict issue when both taxonomy and index are regenerated in the same PR

.github/workflows/appsec_vpatch_lint.yaml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Get changed files
         run: |
           changed_files=$(git diff-tree --no-commit-id --name-only -r $GITHUB_SHA | tr '\n' ',' | sed 's/,$/\n/')

.github/workflows/dispatch_create_branch.yaml

@@ -8,7 +8,7 @@ jobs:
   create_branch:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: peterjgrainger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dispatch_delete_branch.yaml

@@ -8,7 +8,7 @@ jobs:
   delete_branch:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Delete branch
         uses: dawidd6/action-delete-branch@v3
         with:

.github/workflows/generate_taxonomy.yaml

@@ -8,7 +8,7 @@ jobs:
   generate_taxonomy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Go 1.20
       uses: actions/setup-go@v4
       with:

.github/workflows/test_configurations.yaml

@@ -51,7 +51,7 @@ jobs:
       RESULTS_PATH: .
     steps:
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: run tests on last crowdsec tag
       run: |
         mkdir -p /etc/crowdsec && cp -r /staging/etc/* /etc/

.github/workflows/update-blockers.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/setup-go@v1
       with:
         go-version: 1.19
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Create local changes
       run: |
         go build

.github/workflows/update-index.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/setup-go@v1
         with:
           go-version: 1.19
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Create local changes
         run: |
           go build
@@ -60,7 +60,7 @@ jobs:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:

.github/workflows/update_taxonomy.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Get changed files
         run: |
           changed_files=$(git diff-tree --no-commit-id --name-only -r $GITHUB_SHA | tr '\n' ',' | sed 's/,$/\n/')
@@ -42,12 +42,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           filePath: taxonomy/scenario_taxonomy_errors.md
           pr_number: ${{ steps.findPr.outputs.pr }}
+      - uses: nelonoel/[email protected]
       - name: Commit files
         if: ${{ github.event_name == 'push'}}
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
-          (git add taxonomy/ && git commit -m "Update taxonomy") || exit 0
+          (git add taxonomy/ && git commit -m "Update taxonomy" && git pull --rebase origin ${BRANCH_NAME}) || exit 0
       - name: Push changes
         if: ${{ github.event_name == 'push'}}
         uses: ad-m/github-push-action@master
@@ -67,7 +68,7 @@ jobs:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:

.github/workflows/validate.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout hub
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: 'crowdsecurity/crowdsec-yaml-schemas'
         path: crowdsec-yaml-schemas