Skip to content

Commit

Permalink
Merge pull request #1383 from cpcloud/clean-up-builds-systems-ci-check
Browse files Browse the repository at this point in the history
ci: clean up builds systems ci check
  • Loading branch information
cpcloud authored Oct 28, 2023
2 parents 6ae0f9b + f2fd936 commit 38955c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@ concurrency:
cancel-in-progress: true

jobs:
sort-build-systems:
runs-on: ubuntu-22.04
steps:
- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: actions/checkout@v4
- name: Check format
run: nix-shell --packages jq diffutils --run "diff --unified overrides/build-systems.json <(jq --from-file overrides/sort-build-systems.jq --raw-output --sort-keys < overrides/build-systems.json)"

nix-matrix:
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -117,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
needs:
- nix-build
- sort-build-systems
- nix-build-shell
- test-template
steps:
- run: exit 0
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
in

{
overlay = import ./overlay.nix;
overlays.default = import ./overlay.nix;
lib.mkPoetry2Nix = { pkgs }: import ./default.nix { inherit pkgs; };

githubActions =
Expand All @@ -31,7 +31,7 @@
allowAliases = false;
allowInsecurePredicate = _: true;
};
overlays = [ self.overlay ];
inherit (self) overlays;
inherit system;
};
in
Expand Down

0 comments on commit 38955c3

Please sign in to comment.