Skip to content

Commit

Permalink
v13.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
peterebden committed Feb 1, 2019
1 parent ed2558b commit e80d624
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build-linux:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu:20190107
- image: thoughtmachine/please_ubuntu:20190201
environment:
PLZ_ARGS: "-p --profile ci -o buildconfig.ci:true"
steps:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
build-linux-alt:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu_alt:20190107
- image: thoughtmachine/please_ubuntu_alt:20190201
environment:
PLZ_ARGS: "-p --profile ci"
PLZ_COVER: "cover"
Expand Down
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 13.4.1
--------------

* Various minor subrepo improvements & fixes
* Fixed query revdeps which wasn't querying to arbitrary depth correctly.


Version 13.4.0
--------------

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
13.4.0
13.4.1
6 changes: 4 additions & 2 deletions tools/images/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ MAINTAINER [email protected]
# Go, Python, Java and other dependencies.
RUN apt-get update && \
apt-get install -y python3 python3-dev python3-pip openjdk-8-jdk-headless \
curl unzip git locales pkg-config zlib1g-dev golint && \
curl unzip git locales pkg-config zlib1g-dev && \
apt-get clean

# Go - we want 1.11 here but the latest package available is 1.10.
RUN curl -fsSL https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz | tar -xzC /usr/local
RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
# Golint
RUN go get golang.org/x/lint/golint && mv ~/go/bin/golint /usr/local/bin && rm -rf ~/go

# Locale
RUN locale-gen en_GB.UTF-8
Expand Down
4 changes: 2 additions & 2 deletions tools/images/ubuntu_alt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM ubuntu:bionic
MAINTAINER [email protected]

# Most dependencies; Python, Java, Clang and Ruby (only used for fpm)
# Most dependencies; Python, Java, Clang
RUN apt-get update && \
apt-get install -y python3 python3-dev python3-pip openjdk-11-jdk-headless \
curl unzip git locales pkg-config zlib1g-dev clang && \
apt-get clean

# Go - we want 1.11 here but the latest package available is 1.10.
RUN curl -fsSL https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz | tar -xzC /usr/local
RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt

# Locale
Expand Down

0 comments on commit e80d624

Please sign in to comment.