From f408f461fcadcb6081a330f6570186425d99ade7 Mon Sep 17 00:00:00 2001 From: Vladislav Zavialov Date: Tue, 25 Aug 2020 16:49:42 +0300 Subject: [PATCH] Require happy >= 1.20.0 --- aarch64-linux-deb10/Dockerfile | 4 ++-- armv7-linux-deb10/Dockerfile | 4 ++-- i386-linux-deb9/Dockerfile | 2 +- linters/Dockerfile | 4 ++-- x86_64-linux-alpine/Dockerfile | 3 ++- x86_64-linux-centos7/Dockerfile | 2 +- x86_64-linux-deb10/Dockerfile | 2 +- x86_64-linux-deb8/Dockerfile | 2 +- x86_64-linux-deb9/Dockerfile | 2 +- x86_64-linux-fedora27/Dockerfile | 2 +- x86_64-linux-ubuntu2004/Dockerfile | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/aarch64-linux-deb10/Dockerfile b/aarch64-linux-deb10/Dockerfile index 1302ea6..dc81097 100644 --- a/aarch64-linux-deb10/Dockerfile +++ b/aarch64-linux-deb10/Dockerfile @@ -62,8 +62,8 @@ USER ghc WORKDIR /home/ghc/ # Build Haskell tools -RUN cabal update && \ - cabal install hscolour happy alex --constraint 'happy ^>= 1.19.10' +RUN cabal v2-update && \ + cabal install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/armv7-linux-deb10/Dockerfile b/armv7-linux-deb10/Dockerfile index 904ef22..881d053 100644 --- a/armv7-linux-deb10/Dockerfile +++ b/armv7-linux-deb10/Dockerfile @@ -63,8 +63,8 @@ USER ghc WORKDIR /home/ghc/ # Build Haskell tools -RUN cabal update && \ - cabal install hscolour happy alex --constraint 'happy ^>= 1.19.10' +RUN cabal v2-update && \ + cabal install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/i386-linux-deb9/Dockerfile b/i386-linux-deb9/Dockerfile index 7f36ce5..9004d87 100644 --- a/i386-linux-deb9/Dockerfile +++ b/i386-linux-deb9/Dockerfile @@ -43,7 +43,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/linters/Dockerfile b/linters/Dockerfile index c4e6809..e2ba40d 100644 --- a/linters/Dockerfile +++ b/linters/Dockerfile @@ -56,7 +56,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH # Build Linting tools @@ -67,7 +67,7 @@ RUN apt-get update -qq; apt-get install --no-install-recommends -qy python3-pip RUN pip3 install mypy==0.701 USER ghc -RUN cabal update +RUN cabal v2-update ENV LINTER_COMMIT b5650c094c98daec9416ceac92ca2cf3c099640f RUN git clone https://gitlab.haskell.org/ghc/git-haskell-org-hooks && \ git -C git-haskell-org-hooks checkout $LINTER_COMMIT diff --git a/x86_64-linux-alpine/Dockerfile b/x86_64-linux-alpine/Dockerfile index b6fcf70..6f335db 100644 --- a/x86_64-linux-alpine/Dockerfile +++ b/x86_64-linux-alpine/Dockerfile @@ -61,7 +61,8 @@ ENV PATH /home/ghc/.cabal/bin:$PATH # Build Haskell tools RUN cabal user-config update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-update && \ + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV SPHINXBUILD /usr/bin/sphinx-build-3 CMD ["bash"] diff --git a/x86_64-linux-centos7/Dockerfile b/x86_64-linux-centos7/Dockerfile index 9c57a9b..3f65e63 100644 --- a/x86_64-linux-centos7/Dockerfile +++ b/x86_64-linux-centos7/Dockerfile @@ -55,7 +55,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb10/Dockerfile b/x86_64-linux-deb10/Dockerfile index 89950fb..d46b37b 100644 --- a/x86_64-linux-deb10/Dockerfile +++ b/x86_64-linux-deb10/Dockerfile @@ -71,7 +71,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb8/Dockerfile b/x86_64-linux-deb8/Dockerfile index b7f5177..26bec11 100644 --- a/x86_64-linux-deb8/Dockerfile +++ b/x86_64-linux-deb8/Dockerfile @@ -41,7 +41,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb9/Dockerfile b/x86_64-linux-deb9/Dockerfile index 646f103..04bfcba 100644 --- a/x86_64-linux-deb9/Dockerfile +++ b/x86_64-linux-deb9/Dockerfile @@ -56,7 +56,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-fedora27/Dockerfile b/x86_64-linux-fedora27/Dockerfile index c8a36b6..03c1287 100644 --- a/x86_64-linux-fedora27/Dockerfile +++ b/x86_64-linux-fedora27/Dockerfile @@ -49,7 +49,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-ubuntu2004/Dockerfile b/x86_64-linux-ubuntu2004/Dockerfile index 58a9128..5a48615 100644 --- a/x86_64-linux-ubuntu2004/Dockerfile +++ b/x86_64-linux-ubuntu2004/Dockerfile @@ -57,7 +57,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] -- GitLab