Commit 07f7b67a authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'trunk' into 'master' 

linter move, fix branch name

See merge request ansible/ansible!9
parents bb48d85c 5b7456c6

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ check: 
  variables:

    GIT_DEPTH: 1

  script:

    - drr registry.cyberbrain.pw/tools/hadolint:latest hadolint --ignore DL3007 --ignore DL3018 --ignore SC2086 Dockerfile

    - drr registry.cyberbrain.pw/tools/linters/hadolint:latest hadolint --ignore DL3007 --ignore DL3018 --ignore SC2086 Dockerfile



##########################################################################################################
@@ -74,7 +74,7 @@ release: 
  variables:

    GIT_STRATEGY: "none"

  only:

    - /^development$/

    - /^trunk$/

    - /^staging$/

    - /^master$/

  script: