style: nixpkgs-fmt -> nixfmt (#187)

* ci: format nix file changes on push

* style: nixpkgs-fmt -> nixfmt

follows nixos RFC 166. closes #127

* ci: move validate-sources to ci

* ci: deploy.yml -> website.yml
This commit is contained in:
seth 2024-05-21 15:53:14 -06:00 committed by GitHub
parent 1f11b0aeb0
commit ff4ea84b11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 39 deletions

View file

@ -16,24 +16,59 @@ on:
jobs:
format:
name: Check formatting
name: Format Nix files
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4
- name: Get short revision
id: rev
run:
echo "rev=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
- name: Install Nix
uses: cachix/install-nix-action@v27
- name: Format changes
run: |
nix run \
--inputs-from ./dev \
'nixpkgs#nixfmt-rfc-style' -- .
- name: Commit changes
env:
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
uses: planetscale/ghcommit-action@v0.1.39
with:
commit_message: "style: format ${{ steps.rev.outputs.rev }}"
repo: "${{ github.repository }}"
branch: "${{ github.head_ref || github.ref_name }}"
validate-sources:
name: Validate sources
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@V27
- name: Run formatter
- name: Check for external repositories
run: |
nix run --inputs-from ./dev nixpkgs#nixpkgs-fmt -- .
- name: Check for changes
run: git diff --color=always --exit-code
set -e
nix eval --file ./.github/checkSources.nix
vm:
name: Test Modules
runs-on: ubuntu-latest
strategy:
@ -41,7 +76,8 @@ jobs:
test: [unstable, stable]
steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@V27

View file

@ -1,30 +0,0 @@
name: Validate sources
# Per CONTRIBUTING.md, we do not accept unofficial ports. This enforces
# that policy and ensures all sources are only from the official GitHub org
on:
push:
paths:
- '.sources/**'
pull_request:
paths:
- '.sources/**'
workflow_dispatch:
jobs:
check:
name: Check for external repositories
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@V27
- name: Run check
run: |
set -e
nix eval --file ./.github/checkSources.nix

View file

@ -63,7 +63,7 @@
};
});
formatter = forAllSystems (pkgs: pkgs.nixpkgs-fmt);
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
packages = forAllSystems ({ lib, pkgs, system, ... }:
let