diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb7e46d..9ece1c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: matrix: emacs_version: ['28.1', '29.4', '30.2', '31.1'] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: jcs090218/setup-emacs@master with: version: ${{ matrix.emacs_version }} @@ -22,6 +22,6 @@ jobs: - if: matrix.emacs_version != '28.1' run: eask package - run: eask install-deps - - run: eask compile - - run: eask lint package + - run: eask --strict compile + - run: eask --strict lint package - run: eask test buttercup diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e73e048..5b45cac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_REPO: ${{ github.repository }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.merge_commit_sha || github.ref }} diff --git a/Makefile b/Makefile index cb498bf..756f1e5 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,12 @@ @touch .deps .compile: .deps magit-standup.el - eask compile + eask --strict compile @touch .compile lint: .deps - eask lint package - eask lint checkdoc + eask --strict lint package + eask --strict lint checkdoc test: .compile eask test buttercup diff --git a/devenv.lock b/devenv.lock index 58e2f2b..cac961d 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1789773873, - "narHash": "sha256-lFR8A3JzpXn4Az9quklprOje/+Njyh9+bP+CE1TCIxI=", + "lastModified": 1793731702, + "narHash": "sha256-WlVNaWXVTYaGBNey2Z+20sY1lT7BvzJEECb+VlDDdk0=", "owner": "cachix", "repo": "devenv", - "rev": "2ba2f9ed32596289874c58981a4d3e56cadd639d", + "rev": "9655d320b8f9df74dbecf681f52a7334574606c3", "type": "github" }, "original": { @@ -17,16 +17,53 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1793686154, + "narHash": "sha256-Zb/0L3soxrkfcrywpfp0J++0WFLB3tzh0Xtx9up+VNc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "204b6977e00caac19e2313015a598543ca7be150", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "nixpkgs": { "inputs": { "nixpkgs-src": "nixpkgs-src" }, "locked": { - "lastModified": 1789506231, - "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=", + "lastModified": 1793043970, + "narHash": "sha256-m14odYTdkBUEkJOiEYs2zjGjn8fcjvdCJsm45+k084U=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737", + "rev": "d97234e58d4e90e3bf77c082fc3b546e51200938", "type": "github" }, "original": { @@ -39,11 +76,11 @@ "nixpkgs-src": { "flake": false, "locked": { - "lastModified": 1789370336, - "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=", + "lastModified": 1792812153, + "narHash": "sha256-T2+XBfNbf9pecLUWS4+RtuVNZ3W8K5taG5QdV71mWlk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7def046b9a883d46974757852106483d741586f", + "rev": "674a2028661e550a97400c1cc992b9cca9a668a1", "type": "github" }, "original": { @@ -56,6 +93,7 @@ "root": { "inputs": { "devenv": "devenv", + "git-hooks": "git-hooks", "nixpkgs": "nixpkgs" } } diff --git a/devenv.nix b/devenv.nix index a173a9f..1c40be2 100644 --- a/devenv.nix +++ b/devenv.nix @@ -6,10 +6,24 @@ pkgs.eask-cli ]; + git-hooks.hooks = { + actionlint.enable = true; + statix.enable = true; + deadnix.enable = true; + nixfmt.enable = true; + check-yaml.enable = true; + check-merge-conflicts.enable = true; + typos.enable = true; + ripsecrets.enable = true; + }; + enterTest = '' eask install-deps - eask compile - eask lint package + eask --strict compile + eask --strict lint package + eask --strict lint regexps + eask --strict lint declare + eask --strict lint org README.org eask test buttercup ''; } diff --git a/devenv.yaml b/devenv.yaml index a298150..8a19e73 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,5 +1,10 @@ strict_ports: true inputs: + git-hooks: + url: github:cachix/git-hooks.nix + inputs: + nixpkgs: + follows: nixpkgs nixpkgs: url: github:cachix/devenv-nixpkgs/rolling