mirror of
https://github.com/super-linter/super-linter.git
synced 2024-11-21 21:50:59 -05:00
f3c34843e1
The https://github.com/super-linter/super-linter/pull/6113 introduced new Git merge conflicts linter check, that is error prone in some conditions (see screenshot). This PR adjusts this check to be more precise and exact in a way that all three markers should be found to identify check as failed. Additionally improve Git merge conflict markers matchers. Additionally update one good test file.
12 lines
506 B
YAML
12 lines
506 B
YAML
---
|
|
name: "Super-Linter"
|
|
author: "Super-linter contributors"
|
|
description: "Super-linter is a ready-to-run collection of linters and code analyzers, to help validate your source code."
|
|
runs:
|
|
using: "docker"
|
|
image: "docker://ghcr.io/super-linter/super-linter:v7.2.0" # x-release-please-version
|
|
branding:
|
|
icon: "check-square"
|
|
color: "white"
|
|
# You can view https://github.com/super-linter/super-linter#environment-variables
|
|
# to see a comprehensive list of all environment variables that can be passed
|