diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..748b705 --- /dev/null +++ b/.travis.yml @@ -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 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 10e47cb..f4fb9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index d8c8c67..f788df0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index 005324c..bc0923a 100644 --- a/Makefile +++ b/Makefile @@ -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)" @@ -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 \ No newline at end of file