Skip to content

Commit dde6b8c

Browse files
committed
ci: use nix build
1 parent e38f102 commit dde6b8c

File tree

5 files changed

+12
-80
lines changed

5 files changed

+12
-80
lines changed

.github/workflows/deploy.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ jobs:
99
deploy:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/[email protected]
13-
- uses: cachix/install-nix-action@v16
14-
with:
15-
nix_path: nixpkgs=channel:nixos-unstable
16-
- run: nix-shell --run 'cabal update; make clean; make html SPHINXOPTS="-W"'
12+
- uses: actions/checkout@v3
13+
- uses: cachix/install-nix-action@v22
14+
- run: nix build
1715
- name: Deploy 🚀
1816
uses: JamesIves/[email protected]
1917
with:

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
88
SOURCEDIR = .
99
BUILDDIR = _build
10-
SOURCE_DATE_EPOCH = $(shell git log -1 --format=%ct)
1110

1211
# Put it first so that "make" without argument is like "make help".
1312
help:

flake.lock

+1-67
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hoh.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ pkgs.stdenv.mkDerivation {
3232
buildInputs = pythonInputs ++ nonPythonInputs;
3333

3434
preBuild = ''
35-
export SOURCE_DATE_EPOCH="$(${pkgs.coreutils}/bin/date '+%s')"
36-
pip list
35+
unset SOURCE_DATE_EPOCH
3736
'';
3837

3938
buildPhase = ''
4039
runHook preBuild
40+
SOURCE_DATE_EPOCH="$(${pkgs.coreutils}/bin/date '+%s')"
41+
make clean
4142
make ${target} SPHINXOPTS="-W"
4243
touch "_build/.nojekyll"
4344
touch "_build/html/.nojekyll"

src/Case_Studies/klister.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ structures and closing memory leaks; any intermediate level Haskeller should be
1919
able to follow along. After reading this chapter, a reader should be able to
2020
spot inefficient data structure use by reading code, and GHC's profiling tools
2121
to diagnose memory performance issues and identify hot code. To read through the
22-
code, this `commit
23-
<https://github.com/gelisam/klister/commit/33501b2233ce865407a8a3ca7c090457f3375442>`
24-
is the result of the case study, and `here
25-
<https://github.com/gelisam/klister/tree/5aea4d2b9df8f6e9db276078570c1e1bd1306cd3>`
26-
is the state of the klister code base that the tutorial starts with.
22+
code, `this commit
23+
<https://github.com/gelisam/klister/commit/33501b2233ce865407a8a3ca7c090457f3375442>`__
24+
is the result of the case study, and `this commit
25+
<https://github.com/gelisam/klister/tree/5aea4d2b9df8f6e9db276078570c1e1bd1306cd3>`__
26+
was the state of the klister code base that the tutorial starts with.
2727

2828
The rest of the chapter is structured as follows. We introduce the |klister|
2929
interpreter and perform a performance minded code review. We then use the

0 commit comments

Comments
 (0)