Commit 024c47e5 authored by nimrod's avatar nimrod
Browse files

Templates. 

- Use CI templates.
- Use common pre-commit config from snippet.
- Address pre-commit issues.
parent 02407692

.gitlab-ci.yml

+11 −40
Original line number Diff line number Diff line 
---

image: adarnimrod/ci-images:docker



stages:

  - test

  - build



pre-commit:

  stage: test

  image: adarnimrod/ci-images:pre-commit

  variables:

    XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"

    # Disabled until https://github.com/pre-commit/pre-commit/issues/1387 is

    # resolved.

    SKIP: "hadolint,docker-compose"

  script:

    - pre-commit run --all-files

  cache:

    paths:

      - .cache/

include:

  - project: shore/ci-templates

    file: templates/docker-compose.yml



build-host01:

  stage: build

  tags:

    - host01.shore.co.il

  variables: &build_vars

    COMPOSE_DOCKER_CLI_BUILD: "1"

    DOCKER_BUILDKIT: "1"

  script: &build_script

    - docker-compose build --no-cache --pull

    - docker-compose pull --quiet



build-kodi:

  stage: build

  tags:

    - kodi.shore.co.il

  variables: *build_vars

  script: *build_script

  extends: .compose-build

  tags: [host01.shore.co.il]



build-ns4:

  stage: build

  tags:

    - ns4.shore.co.il

  variables: *build_vars

  script: *build_script
 
  extends: .compose-build

  tags: [ns4.shore.co.il]



build-kodi:

  extends: .compose-build

  tags: [kodi.shore.co.il]

.pre-commit-config.yaml

+28 −14
Original line number Diff line number Diff line 
# vim:ff=unix ts=2 sw=2 ai expandtab

---

repos:

  - repo: https://github.com/pre-commit/pre-commit-hooks

    rev: v2.3.0

  - repo: https://github.com/pre-commit/pre-commit-hooks.git

    rev: v3.4.0

    hooks:

      - id: check-added-large-files

      - id: check-executables-have-shebangs

      - id: check-merge-conflict

      - id: detect-private-key

      - id: check-symlinks

      - id: trailing-whitespace



  - repo: https://github.com/Yelp/detect-secrets

    rev: v0.14.3

    hooks:

      - id: detect-secrets



  - repo: https://github.com/adrienverge/yamllint

    rev: v1.17.0

    rev: v1.25.0

    hooks:

      - id: yamllint



  - repo: https://github.com/amperser/proselint/

    rev: 0.10.2

    hooks:

      - id: proselint

        types: [plain-text]

        exclude: LICENSE

  - repo: https://github.com/Yelp/detect-secrets

    rev: v0.13.0

    hooks:

      - id: detect-secrets

  - repo: https://git.shore.co.il/nimrod/docker-pre-commit.git/

    rev: v0.3.0



  - repo: https://github.com/executablebooks/mdformat.git

    rev: 0.5.3

    hooks:

      - id: docker-compose

      - id: hadolint

      - id: mdformat



  - repo: https://git.shore.co.il/nimrod/shell-pre-commit.git

    sha: v0.6.0

    rev: v0.6.0

    hooks:

      - id: shell-lint



  - repo: https://github.com/shellcheck-py/shellcheck-py.git

    rev: v0.7.1.1

    hooks:

      - id: shellcheck



  - repo: https://git.shore.co.il/nimrod/docker-pre-commit.git/

    rev: v0.3.0

    hooks:

      - id: hadolint

      - id: docker-compose

README.md

+4 −5
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`). 


## Author Information



Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website](

https://www.shore.co.il/). Patches are welcome via [`git send-email`](

http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located

at: <https://www.shore.co.il/git/>.

Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my

[website](https://www.shore.co.il/). Patches are welcome via

[`git send-email`](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository

is located at: <https://git.shore.co.il/expore/>.

crond/README.md

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`). 


## Author Information



Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website](

https://www.shore.co.il/). Patches are welcome via [`git send-email`](

http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located

at: <https://git.shore.co.il/nimrod/>.
 
Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my

[website](https://www.shore.co.il/). Patches are welcome via

[`git send-email`](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository

is located at: <https://git.shore.co.il/expore/>.