diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f79f5bd..d95a0c1 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - main jobs: build: @@ -16,7 +16,7 @@ jobs: - name: Set up python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.9 - name: Set PY run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d4620ab..5f73b77 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,33 +1,5 @@ repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + - repo: https://github.com/UCL-MIRSG/.github + rev: v0.25.0 hooks: - - id: check-added-large-files - - id: check-case-conflict - - id: check-docstring-first - - id: check-executables-have-shebangs - - id: check-merge-conflict - - id: check-yaml - - id: end-of-file-fixer - - id: fix-byte-order-marker - - id: mixed-line-ending - args: [--fix=lf] - - id: trailing-whitespace - - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.5.4 - hooks: - - id: forbid-tabs - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 - hooks: - - id: prettier - exclude: ".yml$" - - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.27.0 - hooks: - - id: check-github-workflows - - repo: https://github.com/ansible-community/ansible-lint.git - rev: v6.21.1 - hooks: - - id: ansible-lint - args: ["-p", "."] + - id: mirsg-hooks diff --git a/README.md b/README.md index 76972f9..99cf35b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ All variables are nested in the `docker` dictionary. See [defaults/main.yml](def | Name | Description | | ------------------ | ------------------------------------------------------------------------------------------------------- | | `owner` | The OS user that will have ownership of the Docker service file and directory. Defaults to `root` | -| `group` | The OS group that will have ownership of the Docker service file and directory. Deafults to `root` | +| `group` | The OS group that will have ownership of the Docker service file and directory. Defaults to `root` | | `service_file_dir` | The path to the Docker service. Defaults to `/etc/systemd/system/docker.service.d` | | `service_name` | The name of the Docker service. Defaults to `docker` | | `repo_url` | The url of the Docker repository. Defaults to `https://download.docker.com/linux/centos/docker-ce.repo` | diff --git a/meta/main.yml b/meta/main.yml index a2fbc9a..a8aec72 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -41,7 +41,8 @@ galaxy_info: # - 7 # - 99.99 - galaxy_tags: [] + galaxy_tags: + [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to # remove the '[]' above, if you add tags to this list.