Skip to content

Commit 2f3b768

Browse files
committed
nix: re-enable ghc8107/ghc884 builds, disable "build all binaries"
1 parent 311816b commit 2f3b768

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

.github/workflows/nix.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
name: haskell-language-server
6868
# Disable pushing, we will do that in job `build`
6969
skipPush: true
70-
# - run: |
71-
# nix develop --print-build-logs --command cabal update
72-
# nix develop --print-build-logs --command cabal build
70+
- run: |
71+
nix develop --print-build-logs --command cabal update
72+
nix develop --print-build-logs --command cabal build
7373
7474
# Build and then push HLS binaries with developmet shell to cachix
7575
# This job runs when
@@ -100,23 +100,23 @@ jobs:
100100
with:
101101
name: haskell-language-server
102102
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
103-
# smunix: temporarily disabling this to allow the builds to complete and
104-
# push binaries to caches. Will re-enable later.
105-
# - name: Build development shell
106-
# run: nix develop --print-build-logs --profile dev
107-
# - name: Build all development shell (without nix dependencies)
108-
# run: nix develop --print-build-logs .#all-simple-dev-shells --profile dev
103+
- name: Build development shell
104+
run: nix develop --print-build-logs --profile dev
105+
- name: Build all development shell (without nix dependencies)
106+
run: nix develop --print-build-logs .#all-simple-dev-shells --profile dev
109107
# We only build nix dev shell for current GHC version because some are
110108
# failing with different GHC version on darwin.
111-
# - name: Build development shell with nix dependencies for current GHC version
112-
# run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
113-
# - name: Push development shell
114-
# if: ${{ env.HAS_TOKEN == 'true' }}
115-
# run: cachix push haskell-language-server dev
116-
# - name: Build binaries
117-
# run: nix build --print-build-logs
118-
- name: Build all binaries
119-
run: nix build --print-build-logs .#all-haskell-language-server
109+
- name: Build development shell with nix dependencies for current GHC version
110+
run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
111+
- name: Push development shell
112+
if: ${{ env.HAS_TOKEN == 'true' }}
113+
run: cachix push haskell-language-server dev
114+
- name: Build binaries
115+
run: nix build --print-build-logs
116+
# smunix: "Build all binaries" takes too long to run and doesn't contribute
117+
# to caching to cachix for now; so I'm disabling it for now.
118+
# - name: Build all binaries
119+
# run: nix build --print-build-logs .#all-haskell-language-server
120120
- name: Push binaries
121121
if: ${{ env.HAS_TOKEN == 'true' }}
122122
run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server

flake.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,25 +388,25 @@
388388
# Developement shell with only compiler
389389
simpleDevShells = {
390390
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
391-
# haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
392-
# haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
391+
haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
392+
haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
393393
haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
394394
haskell-language-server-922-dev = mkDevShell ghc922 "cabal-ghc92.project";
395395
};
396396

397397
# Developement shell, haskell packages are also provided by nix
398398
nixDevShells = {
399399
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
400-
# haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
401-
# haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
400+
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
401+
haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
402402
haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
403403
haskell-language-server-922-dev-nix = mkDevShellWithNixDeps ghc922 "cabal-ghc92.project";
404404
};
405405

406406
allPackages = {
407407
haskell-language-server = mkExe ghcDefault;
408-
# haskell-language-server-884 = mkExe ghc884;
409-
# haskell-language-server-8107 = mkExe ghc8107;
408+
haskell-language-server-884 = mkExe ghc884;
409+
haskell-language-server-8107 = mkExe ghc8107;
410410
haskell-language-server-902 = mkExe ghc902;
411411
haskell-language-server-922 = mkExe ghc922;
412412
};

0 commit comments

Comments
 (0)