Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
1 result

Target

Select target project
  • shore/ci-stuff
1 result
Select Git revision
  • master
1 result
Show changes
Commits on Source (2)
--- ---
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks.git - repo: https://github.com/pre-commit/pre-commit-hooks.git
rev: v4.4.0 rev: v5.0.0
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: check-executables-have-shebangs - id: check-executables-have-shebangs
...@@ -18,63 +18,56 @@ repos: ...@@ -18,63 +18,56 @@ repos:
exclude: \.diff$ exclude: \.diff$
- repo: https://github.com/codespell-project/codespell.git - repo: https://github.com/codespell-project/codespell.git
rev: v2.2.5 rev: v2.3.0
hooks: hooks:
- id: codespell - id: codespell
- repo: https://github.com/Yelp/detect-secrets.git - repo: https://github.com/Yelp/detect-secrets.git
rev: v1.4.0 rev: v1.5.0
hooks: hooks:
- id: detect-secrets - id: detect-secrets
- repo: https://gitlab.com/devopshq/gitlab-ci-linter.git - repo: https://gitlab.com/devopshq/gitlab-ci-linter.git
rev: v1.0.2 rev: v1.0.6
hooks: hooks:
- id: gitlab-ci-linter - id: gitlab-ci-linter
args: args:
- "--server" - "--server"
- https://git.shore.co.il - https://git.shore.co.il
- repo: https://github.com/amperser/proselint.git
rev: 0.10.2
hooks:
- id: proselint
types: [plain-text]
exclude: LICENSE
- repo: https://github.com/adrienverge/yamllint.git - repo: https://github.com/adrienverge/yamllint.git
rev: v1.32.0 rev: v1.35.1
hooks: hooks:
- id: yamllint - id: yamllint
- repo: https://github.com/executablebooks/mdformat.git - repo: https://github.com/executablebooks/mdformat.git
rev: 0.7.16 rev: 0.7.21
hooks: hooks:
- id: mdformat - id: mdformat
- repo: https://github.com/pre-commit/pre-commit.git - repo: https://github.com/pre-commit/pre-commit.git
rev: v3.3.3 rev: v4.0.1
hooks: hooks:
- id: validate_manifest - id: validate_manifest
- repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git - repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git
rev: v0.3.0 rev: v0.5.1
hooks: hooks:
- id: shell-validate - id: shell-validate
- id: docker-compose - id: docker-compose
- repo: https://github.com/shellcheck-py/shellcheck-py.git - repo: https://github.com/shellcheck-py/shellcheck-py.git
rev: v0.9.0.5 rev: v0.10.0.1
hooks: hooks:
- id: shellcheck - id: shellcheck
- repo: https://github.com/AleksaC/hadolint-py.git - repo: https://github.com/AleksaC/hadolint-py.git
rev: v2.12.0.2 rev: v2.12.1b3
hooks: hooks:
- id: hadolint - id: hadolint
- repo: https://github.com/ambv/black.git - repo: https://github.com/ambv/black.git
rev: 23.3.0 rev: 24.10.0
hooks: hooks:
- id: black - id: black
args: args:
...@@ -82,7 +75,7 @@ repos: ...@@ -82,7 +75,7 @@ repos:
--line-length=79 --line-length=79
- repo: https://github.com/PyCQA/prospector.git - repo: https://github.com/PyCQA/prospector.git
rev: 1.10.2 rev: v1.13.3
hooks: hooks:
- id: prospector - id: prospector
args: args:
...@@ -109,7 +102,7 @@ repos: ...@@ -109,7 +102,7 @@ repos:
- pyroma - pyroma
- repo: https://github.com/pycqa/flake8.git - repo: https://github.com/pycqa/flake8.git
rev: 6.0.0 rev: 7.1.1
hooks: hooks:
- id: flake8 - id: flake8
args: args:
......
...@@ -5,10 +5,10 @@ include: ...@@ -5,10 +5,10 @@ include:
.tf_template: .tf_template:
image: registry.gitlab.com/gitlab-org/terraform-images/stable:latest image: registry.gitlab.com/components/opentofu/gitlab-opentofu:latest-debian
before_script: before_script:
- cd ${TF_ROOT} - cd ${TF_ROOT}
- terraform version - tofu version
cache: cache:
paths: paths:
- ${TF_ROOT}/.terraform - ${TF_ROOT}/.terraform
...@@ -25,26 +25,26 @@ include: ...@@ -25,26 +25,26 @@ include:
extends: .tf_template extends: .tf_template
stage: test stage: test
script: script:
- gitlab-terraform validate - gitlab-tofu validate
.tf_fmt: .tf_fmt:
extends: .tf_template extends: .tf_template
stage: test stage: test
script: script:
- gitlab-terraform fmt - gitlab-tofu fmt
.tf_validate_fmt: .tf_validate_fmt:
extends: .tf_template extends: .tf_template
stage: test stage: test
script: script:
- gitlab-terraform validate - gitlab-tofu validate
- gitlab-terraform fmt - gitlab-tofu fmt
.tf_plan: .tf_plan:
extends: .tf_template extends: .tf_template
script: script:
- gitlab-terraform plan - gitlab-tofu plan
- gitlab-terraform plan-json - gitlab-tofu plan-json
artifacts: artifacts:
name: plan name: plan
paths: paths:
...@@ -55,5 +55,5 @@ include: ...@@ -55,5 +55,5 @@ include:
.tf_apply: .tf_apply:
extends: .tf_template extends: .tf_template
script: script:
- gitlab-terraform apply - gitlab-tofu apply
when: manual when: manual