From 8225c7e40277451ce3a839bab9da61db87a39f89 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 30 Aug 2024 18:14:19 +0200
Subject: [PATCH] ci: always run ci (#4334)

(cherry picked from commit 294ec4d5ec58db1ab84414545e702388577c9074)

# Conflicts:
#	.github/workflows/md-link-checker.yml
#	.github/workflows/test-integration.yml
#	.github/workflows/test-lint.yml
#	.github/workflows/test.yml
---
 .github/workflows/md-link-checker.yml  | 12 ++++++------
 .github/workflows/test-integration.yml |  4 ++++
 .github/workflows/test-lint.yml        |  4 ++++
 .github/workflows/test.yml             |  4 ++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/md-link-checker.yml b/.github/workflows/md-link-checker.yml
index cbe6df9577..be62b6c222 100644
--- a/.github/workflows/md-link-checker.yml
+++ b/.github/workflows/md-link-checker.yml
@@ -1,11 +1,7 @@
 name: Check Markdown links
 on:
   pull_request:
-    paths:
-      - "**.*.md"
   push:
-    paths:
-      - "**.*.md"
     branches:
       - main
       - release/*
@@ -18,14 +14,18 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v3.4.0
       - uses: technote-space/get-diff-action@v6.1.2
         with:
           PATTERNS: |
             **/*.md
+=======
+      - uses: actions/checkout@v4
+>>>>>>> 294ec4d5 (ci: always run ci (#4334))
       - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13
         if: env.GIT_DIFF
         with:
           folder-path: "."
-          use-verbose-mode: 'yes'
-          config-file: '.github/workflows/md-link-checker-config.json'
+          use-verbose-mode: "yes"
+          config-file: ".github/workflows/md-link-checker-config.json"
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 53f01068da..2ab68d4391 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -36,6 +36,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
         test-path: ${{fromJson(needs.pre-test.outputs.matrix)}}
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v3.4.0
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -46,6 +47,9 @@ jobs:
             go.mod
             go.sum
             **/testdata/**
+=======
+      - uses: actions/checkout@v4
+>>>>>>> 294ec4d5 (ci: always run ci (#4334))
 
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
index 5bc184f1dc..e9725f9837 100644
--- a/.github/workflows/test-lint.yml
+++ b/.github/workflows/test-lint.yml
@@ -19,6 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 6
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v3.4.0
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -27,6 +28,9 @@ jobs:
             **/*.plush
             go.mod
             go.sum
+=======
+      - uses: actions/checkout@v4
+>>>>>>> 294ec4d5 (ci: always run ci (#4334))
 
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 41bd4df6c8..2984aff192 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v3.4.0
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -29,6 +30,9 @@ jobs:
             go.mod
             go.sum
             **/testdata/**
+=======
+      - uses: actions/checkout@v4
+>>>>>>> 294ec4d5 (ci: always run ci (#4334))
 
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF