Skip to content

Commit

Permalink
Merge pull request #39 from psibi/update-lts
Browse files Browse the repository at this point in the history
Update lts
  • Loading branch information
psibi authored Jul 3, 2021
2 parents 74a6ea0 + 9a1f784 commit 0e1b6bd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 12 deletions.
8 changes: 2 additions & 6 deletions .azure/azure-linux-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ jobs:
BUILD: stack
STACK_YAML: stack.yaml
DEPLOY: 1
stack-lts-13:
stack-lts-16:
BUILD: stack
STACK_YAML: stack-lts-13.yaml
STACK_YAML: stack.yaml
nightly:
BUILD: stack
ARGS: "--resolver nightly"
style:
BUILD: style
maxParallel: 4
steps:
- bash: echo "##vso[task.setvariable variable=TAG]${BUILD_SOURCEBRANCH##refs/tags/}"
Expand Down Expand Up @@ -58,8 +56,6 @@ jobs:
env:
OS_NAME: ${{ parameters.os }}
displayName: 'Installation ${{parameters.os}} & Test'
- bash: ./.azure/build_release.sh
displayName: Build Release
- task: ArchiveFiles@2
inputs:
includeRootFolder: false
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fpco/alpine-haskell-stack:8.6.5
FROM fpco/alpine-haskell-stack:8.10.4

COPY . /app

Expand Down
9 changes: 9 additions & 0 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
with import (fetchTarball
"https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz") { };
stdenv.mkDerivation {
name = "xmonad";
buildInputs = [
ghc
zlib
];
}
5 changes: 4 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
resolver: lts-14.7
resolver: lts-18.0

packages:
- '.'

nix:
shell-file: shell.nix
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
size: 523700
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/7.yaml
sha256: 8e3f3c894be74d71fa4bf085e0a8baae7e4d7622d07ea31a52736b80f8b9bb1a
original: lts-14.7
size: 585393
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/0.yaml
sha256: c632012da648385b9fa3c29f4e0afd56ead299f1c5528ee789058be410e883c0
original: lts-18.0

0 comments on commit 0e1b6bd

Please sign in to comment.