Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: nixpkgs-fmt -> nixfmt #187

Merged
merged 4 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 44 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,68 @@ 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
uses: cachix/install-nix-action@v27

- name: Run formatter
- name: Format changes
run: |
nix run --inputs-from ./dev nixpkgs#nixpkgs-fmt -- .
nix run \
--inputs-from ./dev \
'nixpkgs#nixfmt-rfc-style' -- .

- name: Commit changes
env:
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
uses: planetscale/[email protected]
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: Check for changes
run: git diff --color=always --exit-code
- name: Check for external repositories
run: |
set -e
nix eval --file ./.github/checkSources.nix

vm:
name: Test Modules

runs-on: ubuntu-latest

strategy:
matrix:
test: [unstable, stable]

steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@V27
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/validate-sources.yml

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion dev/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
};
});

formatter = forAllSystems (pkgs: pkgs.nixpkgs-fmt);
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);

packages = forAllSystems ({ lib, pkgs, system, ... }:
let
Expand Down