saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

adding saltstack-internal tag to get perms right

Browse source
This commit is contained in:
Felippe Burk 2020-04-08 23:25:06 -06:00 • committed by Bryce Larson
parent 933a79f8cf
commit 0cf809a3c3
No known key found for this signature in database
GPG key ID: 131C38B0F02DB4CA
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

@ -1,11 +1,17 @@
--- ---
stages: stages:
- lint - pre-commit
- test - test
include:
- project: 'saltstack/pop/cicd/ci-templates'
file: '/lint/pre-commit-run-all.yml'
lint-salt-full: lint-salt-full:
image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
stage: lint stage: pre-commit
tags:
- saltstack-internal
cache: cache:
key: nox-lint-cache key: nox-lint-cache
paths: paths:
@ -25,7 +31,9 @@ lint-salt-full:
lint-tests-full: lint-tests-full:
image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
stage: lint stage: pre-commit
tags:
- saltstack-internal
cache: cache:
key: nox-lint-cache key: nox-lint-cache
paths: paths:
@ -46,6 +54,8 @@ lint-tests-full:
docs-build-html: docs-build-html:
image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
stage: test stage: test
tags:
- saltstack-internal
cache: cache:
key: nox-docs-cache key: nox-docs-cache
paths: paths:
@ -61,6 +71,8 @@ docs-build-html:
docs-build-man-pages: docs-build-man-pages:
image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
stage: test stage: test
tags:
- saltstack-internal
cache: cache:
key: nox-docs-cache key: nox-docs-cache
paths: paths:

6
.pre-commit-config.yaml
View file

@ -106,7 +106,6 @@ repos:
- --py-version=3.5 - --py-version=3.5
- --platform=linux - --platform=linux
- id: pip-tools-compile - id: pip-tools-compile
alias: compile-linux-py3.6-zmq-requirements alias: compile-linux-py3.6-zmq-requirements
name: Linux Py3.6 ZeroMQ Requirements name: Linux Py3.6 ZeroMQ Requirements
@ -206,7 +205,6 @@ repos:
- --py-version=3.6 - --py-version=3.6
- --platform=linux - --platform=linux
- id: pip-tools-compile - id: pip-tools-compile
alias: compile-linux-py3.7-zmq-requirements alias: compile-linux-py3.7-zmq-requirements
name: Linux Py3.7 ZeroMQ Requirements name: Linux Py3.7 ZeroMQ Requirements
@ -307,7 +305,7 @@ repos:
- --platform=linux - --platform=linux
- repo: https://github.com/timothycrosley/isort - repo: https://github.com/timothycrosley/isort
rev: '1e78a9acf3110e1f9721feb591f89a451fc9876a' rev: "1e78a9acf3110e1f9721feb591f89a451fc9876a"
hooks: hooks:
- id: isort - id: isort
additional_dependencies: ['toml'] additional_dependencies: ['toml']
@ -321,7 +319,7 @@ repos:
)$ )$
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: stable rev: 19.10b0
hooks: hooks:
- id: black - id: black
# This tells pre-commit not to pass files to black. # This tells pre-commit not to pass files to black.