From 4bbd1ba90d81ec56ba473610c428e1941fd1d468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Fri, 12 Feb 2021 09:52:34 +0100 Subject: [PATCH] Update for B202 --- .gitlab-ci.yml | 2 +- .travis.yml | 19 ------------------- package.yaml | 2 +- stack.yaml | 2 +- stack.yaml.lock | 12 ++++++++++++ 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 .travis.yml create mode 100644 stack.yaml.lock diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5199db..61be4cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: haskell:8 +image: haskell:8.8.4 variables: STACK_ROOT: "${CI_PROJECT_DIR}/.stack" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bcbad35..0000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -# https://docs.haskellstack.org/en/stable/travis_ci/ -sudo: false -# Not Haskell with cabal but with stack tool -language: c -cache: - directories: - - ~/.stack -addons: - apt: - packages: - - libgmp-dev -before_install: - - mkdir -p ~/.local/bin - - export PATH=$HOME/.local/bin:$PATH - - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' -install: - - stack --no-terminal --install-ghc test --only-dependencies -script: - - stack --no-terminal test --haddock --no-haddock-deps diff --git a/package.yaml b/package.yaml index a12d19a..3da6145 100644 --- a/package.yaml +++ b/package.yaml @@ -4,7 +4,7 @@ github: "MI-AFP/hw03" license: MIT author: "Marek Suchánek" maintainer: "marek.suchanek@fit.cvut.cz" -copyright: "2018 Marek Suchánek" +copyright: "2021 Marek Suchánek" extra-source-files: - README.md diff --git a/stack.yaml b/stack.yaml index 97a175f..bcde078 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-10.4 +resolver: lts-16.31 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..c222190 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 534126 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + sha256: 637fb77049b25560622a224845b7acfe81a09fdb6a96a3c75997a10b651667f6 + original: lts-16.31