diff --git a/.gitignore b/.gitignore index 42e31f650..112e7f59a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .python-version .idea/ .direnv/ +/var/ # ignore roles pulled by ansible-galaxy /roles/galaxy/* diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f93f65920..af1bc82ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,6 @@ --- -default_install_hook_types: [pre-push] -exclude: "LICENSES/" +exclude: "^(LICENSES/|var/)" # See: https://pre-commit.com/hooks.html repos: @@ -24,3 +23,10 @@ repos: rev: v6.2.0 hooks: - id: reuse + - repo: https://github.com/ansible/ansible-lint + rev: v26.3.0 + hooks: + - id: ansible-lint + files: '^roles/custom/' + args: ['roles/custom'] + pass_filenames: false diff --git a/flake.nix b/flake.nix index 3738e97db..3372a2774 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ devShells.default = mkShell { buildInputs = [ just + mise ansible ]; shellHook = '' diff --git a/justfile b/justfile index dc54828fc..b92a8a52f 100644 --- a/justfile +++ b/justfile @@ -4,6 +4,11 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later +# mise (dev tool version manager) +mise_data_dir := env("MISE_DATA_DIR", justfile_directory() / "var/mise") +mise_trusted_config_paths := justfile_directory() / "mise.toml" +prek_home := env("PREK_HOME", justfile_directory() / "var/prek") + # Shows help default: @{{ just_executable() }} --list --justfile "{{ justfile() }}" @@ -39,9 +44,39 @@ update-playbook-only: @git pull -q @-git stash pop -q -# Runs ansible-lint against all roles in the playbook -lint: - ansible-lint +# Invokes mise with the project-local data directory +mise *args: _ensure_mise_data_directory + #!/bin/sh + export MISE_DATA_DIR="{{ mise_data_dir }}" + export MISE_TRUSTED_CONFIG_PATHS="{{ mise_trusted_config_paths }}" + export MISE_YES=1 + export PREK_HOME="{{ prek_home }}" + mise {{ args }} + +# Runs prek (pre-commit hooks manager) with the given arguments +prek *args: _ensure_mise_tools_installed + @{{ just_executable() }} --justfile "{{ justfile() }}" mise exec -- prek {{ args }} + +# Runs pre-commit hooks on staged files +prek-run-on-staged *args: _ensure_mise_tools_installed + @{{ just_executable() }} --justfile "{{ justfile() }}" prek run {{ args }} + +# Runs pre-commit hooks on all files +prek-run-on-all *args: _ensure_mise_tools_installed + @{{ just_executable() }} --justfile "{{ justfile() }}" prek run --all-files {{ args }} + +# Installs the git pre-commit hook +prek-install-git-pre-commit-hook: _ensure_mise_tools_installed + #!/usr/bin/env sh + set -eu + {{ just_executable() }} --justfile "{{ justfile() }}" mise exec -- prek install + hook="{{ justfile_directory() }}/.git/hooks/pre-commit" + # The installed git hook runs later under Git, outside this just/mise environment. + # Injecting PREK_HOME keeps prek's cache under var/prek instead of a global home dir, + # which is more predictable and works better in sandboxed tools like Codex/OpenCode. + if [ -f "$hook" ] && ! grep -q '^export PREK_HOME=' "$hook"; then + sed -i '2iexport PREK_HOME="{{ prek_home }}"' "$hook" + fi # Runs the playbook with --tags=install-all,ensure-matrix-users-created,start and optional arguments install-all *extra_args: (run-tags "install-all,ensure-matrix-users-created,start" extra_args) @@ -84,3 +119,12 @@ stop-group group *extra_args: # Rebuilds the mautrix-meta-instagram Ansible role using the mautrix-meta-messenger role as a source rebuild-mautrix-meta-instagram: /bin/bash "{{ justfile_directory() }}/bin/rebuild-mautrix-meta-instagram.sh" "{{ justfile_directory() }}/roles/custom" + +# Internal - ensures var/mise and var/prek directories exist +_ensure_mise_data_directory: + @mkdir -p "{{ mise_data_dir }}" + @mkdir -p "{{ prek_home }}" + +# Internal - ensures mise tools are installed +_ensure_mise_tools_installed: _ensure_mise_data_directory + @{{ just_executable() }} --justfile "{{ justfile() }}" mise install --quiet diff --git a/mise.toml b/mise.toml new file mode 100644 index 000000000..00cee20f2 --- /dev/null +++ b/mise.toml @@ -0,0 +1,9 @@ +# SPDX-FileCopyrightText: 2026 Slavi Pantaleev +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +[tools] +prek = "0.3.2" + +[settings] +yes = true