From eea731b9d54c6ae85bb50de5d0887d8e241ea9a1 Mon Sep 17 00:00:00 2001 From: softprops Date: Sun, 20 Jan 2019 01:24:06 -0500 Subject: [PATCH 1/3] bump rust version --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10e47cb..74a2613 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.2.0-rust-1.31.2 (unreleased) + +* Upgrade to Rust `1.13.2` + # 0.2.0-rust-1.31.1 * Upgrade to Rust `1.13.1` diff --git a/Dockerfile b/Dockerfile index d8c8c67..4a0e1ee 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 +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.31.2 ADD build.sh /usr/local/bin/ VOLUME ["/code"] WORKDIR /code diff --git a/Makefile b/Makefile index 005324c..e38f3bd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION ?= 0.2.0 -RUST_VERSION ?= 1.31.1 +RUST_VERSION ?= 1.31.2 REPO ?= softprops/lambda-rust TAG ?= "$(REPO):$(VERSION)-rust-$(RUST_VERSION)" From e51b8f067af2caae5835998af69443c4c133ac48 Mon Sep 17 00:00:00 2001 From: softprops Date: Sun, 20 Jan 2019 01:33:29 -0500 Subject: [PATCH 2/3] update changelog with link, one source of truth for RUST_VERSION --- CHANGELOG.md | 6 +++--- Dockerfile | 4 ++-- Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a2613..f4fb9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ -# 0.2.0-rust-1.31.2 (unreleased) +# 0.2.0-rust-1.32.0 (unreleased) -* Upgrade to Rust `1.13.2` +* 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 4a0e1ee..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.2 +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 e38f3bd..bc0923a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION ?= 0.2.0 -RUST_VERSION ?= 1.31.2 +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 From e738616bc09820ce6a48a27a0e1a76d98eb0714a Mon Sep 17 00:00:00 2001 From: softprops Date: Sun, 20 Jan 2019 01:37:59 -0500 Subject: [PATCH 3/3] travis build --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .travis.yml 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