Skip to content
This repository has been archived by the owner on Jan 15, 2024. It is now read-only.

Commit

Permalink
Use mirsg hooks and composite actions (#15)
Browse files Browse the repository at this point in the history
- use the mirsg pre-commit meta hook, and run on all files
- use the mirsg composite actions
  • Loading branch information
p-j-smith authored Oct 24, 2023
1 parent f8e7bd8 commit 40a515b
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 86 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/add-issue-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Add issue to project

on:
issues:
types:
- opened

jobs:
add-issue-to-project:
runs-on: ubuntu-latest
steps:
- uses: UCL-MIRSG/.github/actions/[email protected]
with:
app-id: ${{ secrets.APP_ID }}
app-pem: ${{ secrets.APP_PEM }}
40 changes: 8 additions & 32 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,16 @@
---
name: Pre-commit checks
name: Linting

on:
pull_request:
push:
branches:
- main
- main
- "renovate/**"
pull_request:

jobs:
build:
linting:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Set PY
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV

- name: Cache pre-commit install
uses: actions/cache@v3
- uses: UCL-MIRSG/.github/actions/[email protected]
with:
path: |
${{ env.pythonLocation }}
~/.cache/pre-commit
key: |
pre-commit-${{ env.PY }}-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install dependencies
run: pip install pre-commit

- name: Install pre-commit hooks
run: pre-commit install

- name: Run pre-commit
run: pre-commit run --all-files --color always
pre-commit-config: ./.pre-commit-config.yaml
25 changes: 4 additions & 21 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "mirsg.docker"
name: Molecule Test
on:
pull_request:
push:
Expand All @@ -14,28 +14,11 @@ jobs:
molecule_scenario:
- centos7
- rocky8

env:
PY_COLORS: 1
ANSIBLE_FORCE_COLOR: 1

steps:
- name: Check out code
uses: actions/checkout@v4

- name: Set up Python 3.9
uses: actions/setup-python@v4
- name: Run `molecule test`
uses: UCL-MIRSG/.github/actions/[email protected]
with:
python-version: 3.9

- name: Install test dependencies
run: |
sudo apt-get update && sudo apt-get -y install rsync
python3 -m pip install --upgrade pip
python3 -m pip install ansible ansible-lint molecule molecule-plugins[docker] docker requests==2.29.0
- name: Run role tests
run: >-
molecule --version &&
ansible --version &&
molecule --debug test -s ${{ matrix.molecule_scenario }}
scenario: ${{ matrix.molecule_scenario }}
34 changes: 3 additions & 31 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 40a515b

Please sign in to comment.