yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [yetus] branch master updated: YETUS-901. Update Haskell compiler so that shellcheck 0.7.0 compiles (#69)
Date Wed, 14 Aug 2019 13:09:27 GMT
This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/master by this push:
     new e8f542b  YETUS-901. Update Haskell compiler so that shellcheck 0.7.0 compiles (#69)
e8f542b is described below

commit e8f542b3c183a196263dd08a9726536d394b63f6
Author: Allen Wittenauer <aw@apache.org>
AuthorDate: Wed Aug 14 06:09:23 2019 -0700

    YETUS-901. Update Haskell compiler so that shellcheck 0.7.0 compiles (#69)
---
 precommit/src/main/shell/test-patch-docker/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile
index ec7430b..6b4eee9 100644
--- a/precommit/src/main/shell/test-patch-docker/Dockerfile
+++ b/precommit/src/main/shell/test-patch-docker/Dockerfile
@@ -44,6 +44,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends
-y \
     apt-transport-https \
     ca-certificates \
     curl \
+    dirmngr \
     git \
     libffi-dev \
     locales \
@@ -217,13 +218,15 @@ ENV BUNDLE_PATH /var/tmp/.bundler-gems
 # NOTE: A bunch of stuff is removed to shrink the size of the Docker image
 # Be very careful changing the code here, layer size may grow very large!
 ####
-RUN apt-get -q update && apt-get -q install --no-install-recommends -y cabal-install
\
+RUN add-apt-repository -y ppa:hvr/ghc
+RUN apt-get -q update \
+    && apt-get -q install --no-install-recommends -y cabal-install-3.0 ghc-8.6.5
\
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && cabal update \
-    && cabal install -j ShellCheck \
+    && PATH=/opt/ghc/bin:${PATH} cabal update \
+    && PATH=/opt/ghc/bin:${PATH} cabal install -j ShellCheck \
     && cp -p /root/.cabal/bin/shellcheck /usr/local/bin/shellcheck \
-    && apt remove -y ghc cabal-install \
+    && apt remove -y cabal-install-3.0 ghc-8.6.5 \
     && apt autoremove -y \
     && rm -rf /root/.cabal
 


Mime
View raw message