Skip to content

Commit c2dd431

Browse files
committed
Merge branch 'rc/0.1.4.0'
2 parents 7a2895e + 3a665fe commit c2dd431

11 files changed

Lines changed: 3 additions & 4 deletions

File tree

scripts/release/templates/deb/docker/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ FROM <<DISTRO>>:<<DISTRO-VERSION>>
33
ENV DEBIAN_FRONTEND noninteractive
44
RUN apt-get update
55
RUN apt-get install -y net-tools wget zlib1g-dev lsb-release locales wget ca-certificates libgmp-dev
6-
ENV LANG en_US.UTF-8
7-
RUN locale-gen $LANG
6+
ENV LANG C.UTF-8
87

98
# STACK
109
RUN wget -q -O- http://download.fpcomplete.com/ubuntu/fpco.key | apt-key add -
@@ -15,7 +14,7 @@ RUN apt-get install -y stack
1514
# RUBY & FPM
1615
RUN apt-get install -y ruby-dev libffi-dev make build-essential
1716
RUN apt-get install -y rubygems || true
18-
RUN gem install fpm
17+
RUN gem install fpm --version '< 1.4.0'
1918

2019
# RUN ENVIRONMENT
2120
COPY run.sh /run.sh

scripts/release/templates/rpm/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN yum -y install perl make automake gcc gmp-devel zlib-devel rpm-build tar whi
77
# RUBY & FPM
88
RUN yum -y install ruby-devel
99
RUN bash -c 'if [[ "<<DISTRO>>" == "centos" && "<<DISTRO-VERSION>>" < "7" ]]; then yum -y install rubygems; fi'
10-
RUN gem install fpm
10+
RUN gem install fpm --version '< 1.4.0'
1111

1212
# STACK
1313
RUN curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/<<DISTRO>>/<<DISTRO-VERSION>>/fpco.repo >/etc/yum.repos.d/fpco.repo

test/integration/tests/32-unlisted-module/Main.hs renamed to test/integration/disabled-tests/32-unlisted-module/Main.hs

File renamed without changes.

test/integration/tests/32-unlisted-module/files/embed_FAIL.txt renamed to test/integration/disabled-tests/32-unlisted-module/files/embed_FAIL.txt

File renamed without changes.

test/integration/tests/32-unlisted-module/files/embed_OK.txt renamed to test/integration/disabled-tests/32-unlisted-module/files/embed_OK.txt

File renamed without changes.

test/integration/tests/32-unlisted-module/files/files.cabal renamed to test/integration/disabled-tests/32-unlisted-module/files/files.cabal

File renamed without changes.

test/integration/tests/32-unlisted-module/files/src/Main.hs renamed to test/integration/disabled-tests/32-unlisted-module/files/src/Main.hs

File renamed without changes.

test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs renamed to test/integration/disabled-tests/32-unlisted-module/files/src/Unlisted_FAIL.hs

File renamed without changes.

test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs renamed to test/integration/disabled-tests/32-unlisted-module/files/src/Unlisted_OK.hs

File renamed without changes.

test/integration/tests/32-unlisted-module/files/src/main/Main.hs renamed to test/integration/disabled-tests/32-unlisted-module/files/src/main/Main.hs

File renamed without changes.

0 commit comments

Comments
 (0)