Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: bash

# only build pushes to master
# prs are build separately
# https://docs.travis-ci.com/user/pull-requests/#how-pull-requests-are-built
branches:
only:
- master

services:
- docker

script:
make build
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# 0.2.0-rust-1.32.0 (unreleased)

* Upgrade to Rust [`1.32.0`](https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html)

# 0.2.0-rust-1.31.1

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

# 0.2.0-rust-1.31.0

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://github.com/ilianaw/rust-crowbar/issues/20
# https://github.com/lambci/docker-lambda#documentation
FROM lambci/lambda:build-provided
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.31.1
ARG RUST_VERSION
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
ADD build.sh /usr/local/bin/
VOLUME ["/code"]
WORKDIR /code
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION ?= 0.2.0
RUST_VERSION ?= 1.31.1
RUST_VERSION ?= 1.32.0
REPO ?= softprops/lambda-rust
TAG ?= "$(REPO):$(VERSION)-rust-$(RUST_VERSION)"

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

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