Skip to content

Commit

Permalink
Merge pull request #1 from srid/master
Browse files Browse the repository at this point in the history
  • Loading branch information
dezren39 authored Aug 30, 2024
2 parents 0867205 + a864dc8 commit 0136e44
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ jobs:
- name: Build Nix
run: |
om ci --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" run --systems "${{ matrix.system }}"
- name: Check closure size
run: |
nix run .#check-closure-size
flake-parts-docs:
if: false # Currently fails in CI
if: false # Currently fails in CI
runs-on: x86_64-linux
steps:
- name: Docs for flake.parts
Expand Down
4 changes: 2 additions & 2 deletions emanote/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ https://emanote.srid.ca/examples

## Developing

Emanote is a Haskell software.[^licenses] Thanks to Nix, this repository is pre-configured to provide a delightful development experience with full IDE support in Visual Studio Code.
Emanote is a Haskell software.[^licenses] Thanks to Nix, this repository is pre-configured to provide a delightful development experience with full IDE support in Visual Studio Code.

See https://srid.ca/haskell-template/start for complete instructions, but briefly: [Install Nix](https://nixos.asia/en/install) and run `nix develop -c just run`.

See [architecture](https://emanote.srid.ca/architecture) for a high-level overview of the codebase.

### PR contribution guidelines

You may want to run `nix run github:srid/nixci build` before opening a PR, but the CI will run it as well.
You may want to run `nix run github:juspay/omnix ci run` before opening a PR, but the CI will run it as well.

## Discussion

Expand Down
15 changes: 13 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
tagtree.jailbreak = true;
tailwind.broken = false;
tailwind.jailbreak = true;
unionmount.check = !pkgs.stdenv.isDarwin; # garnix: Slow M1 builder
unionmount.check = !pkgs.stdenv.isDarwin; # garnix: Slow M1 builder
emanote = { name, pkgs, self, super, ... }: {
check = false;
extraBuildDepends = [ pkgs.stork ];
Expand All @@ -108,7 +108,7 @@
longDescription = ''
Emanote is a tool for generating a structured view of your
plain-text notes on the web, as a statically generated
website as well as a local live server.
website as well as a local live server.
For editing notes, you can use any text editor of your
choice including the likes of Obsidian.
Expand Down Expand Up @@ -192,6 +192,17 @@
description = "A simple flake.nix template for emanote notebooks";
path = builtins.path { path = inputs.emanote-template; filter = path: _: baseNameOf path == "flake.nix"; };
};
om.ci.default = {
emanote = {
dir = ".";
steps.custom = {
closure-size = {
type = "app";
name = "check-closure-size";
};
};
};
};
};
};
}

0 comments on commit 0136e44

Please sign in to comment.