fixes

.github/workflows/md-link-checker.yml

@@ -1,7 +1,11 @@
 name: Check Markdown links
 on:
   pull_request:
+    paths:
+      - "**.*.md"
   push:
+    paths:
+      - "**.*.md"
     branches:
       - main
       - release/*
@@ -14,17 +18,8 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/[email protected]
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/*.md
-=======
-      - uses: actions/checkout@v4
->>>>>>> 294ec4d5 (ci: always run ci (#4334))
       - uses: gaurav-nelson/[email protected]
-        if: env.GIT_DIFF
         with:
           folder-path: "."
           use-verbose-mode: "yes"

.github/workflows/test-integration.yml

@@ -36,28 +36,12 @@ jobs:
         os: [ubuntu-latest, macos-latest]
         test-path: ${{fromJson(needs.pre-test.outputs.matrix)}}
     steps:
-<<<<<<< HEAD
       - uses: actions/[email protected]
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/*.go
-            **/*.plush
-            **/*.tpl
-            go.mod
-            go.sum
-            **/testdata/**
-=======
-      - uses: actions/checkout@v4
->>>>>>> 294ec4d5 (ci: always run ci (#4334))
-
       - uses: actions/setup-go@v4
-        if: env.GIT_DIFF
         with:
           go-version: "stable"
 
       - name: Run Integration Tests
-        if: env.GIT_DIFF
         env:
           GOTOOLCHAIN: local+path
           GOSUMDB: off

.github/workflows/test-lint.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     paths-ignore:
-      - '**.md'
+      - "**.md"
     branches:
       - main
       - release/*
@@ -19,27 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 6
     steps:
-<<<<<<< HEAD
       - uses: actions/[email protected]
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/*.go
-            **/*.plush
-            go.mod
-            go.sum
-=======
-      - uses: actions/checkout@v4
->>>>>>> 294ec4d5 (ci: always run ci (#4334))
-
       - uses: actions/setup-go@v4
-        if: env.GIT_DIFF
         with:
           go-version-file: go.mod
           cache: false
 
       - uses: golangci/golangci-lint-action@v3
-        if: env.GIT_DIFF
         with:
           version: v1.54.2
           install-mode: goinstall

.github/workflows/test.yml

@@ -20,33 +20,17 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-<<<<<<< HEAD
       - uses: actions/[email protected]
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/*.go
-            **/*.plush
-            go.mod
-            go.sum
-            **/testdata/**
-=======
-      - uses: actions/checkout@v4
->>>>>>> 294ec4d5 (ci: always run ci (#4334))
-
       - uses: actions/setup-go@v4
-        if: env.GIT_DIFF
         with:
           go-version: "1.21"
           cache: true
           cache-dependency-path: go.sum
 
       - run: ./scripts/test-coverage
-        if: env.GIT_DIFF
 
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
-        if: env.GIT_DIFF
         with:
           file: ./coverage.txt
           fail_ci_if_error: false