Skip to content

Commit 862a27e

Browse files
authored
Merge pull request #3 from softprops/1-32-0
bump rust version to 1.32.0
2 parents 6975094 + e738616 commit 862a27e

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

.travis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: bash
2+
3+
# only build pushes to master
4+
# prs are build separately
5+
# https://docs.travis-ci.com/user/pull-requests/#how-pull-requests-are-built
6+
branches:
7+
only:
8+
- master
9+
10+
services:
11+
- docker
12+
13+
script:
14+
make build

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# 0.2.0-rust-1.32.0 (unreleased)
2+
3+
* Upgrade to Rust [`1.32.0`](https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html)
4+
15
# 0.2.0-rust-1.31.1
26

3-
* Upgrade to Rust `1.13.1`
7+
* Upgrade to Rust [`1.13.1`](https://blog.rust-lang.org/2018/12/20/Rust-1.31.1.html)
48

59
# 0.2.0-rust-1.31.0
610

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# https://github.com/ilianaw/rust-crowbar/issues/20
21
# https://github.com/lambci/docker-lambda#documentation
32
FROM lambci/lambda:build-provided
4-
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.31.1
3+
ARG RUST_VERSION
4+
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
55
ADD build.sh /usr/local/bin/
66
VOLUME ["/code"]
77
WORKDIR /code

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION ?= 0.2.0
2-
RUST_VERSION ?= 1.31.1
2+
RUST_VERSION ?= 1.32.0
33
REPO ?= softprops/lambda-rust
44
TAG ?= "$(REPO):$(VERSION)-rust-$(RUST_VERSION)"
55

@@ -8,5 +8,5 @@ publish: build
88
docker push $(REPO):latest
99

1010
build:
11-
docker build -t $(TAG) .
11+
docker build --build-arg RUST_VERSION=$(RUST_VERSION) -t $(TAG) .
1212
docker tag $(TAG) $(REPO):latest

0 commit comments

Comments
 (0)