From 8715277fd6f3c4b1b3737d421bf16ad1c91d8d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 5 Jul 2018 23:18:13 +0200 Subject: [PATCH 1/2] chore(go): use Go 1.10.3 --- .travis.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65ea7f84c..218e330f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ defaults_go: &DEFAULTS_GO language: go - go: "1.10.2" + go: "1.10.3" cache: directories: - vendor diff --git a/Dockerfile b/Dockerfile index 47da101cd..1b193b75f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ RUN apk add --update make git COPY . /unsee RUN make -C /unsee webpack -FROM golang:1.10.2-alpine as go-builder +FROM golang:1.10.3-alpine as go-builder COPY --from=nodejs-builder /unsee /go/src/github.com/prymitive/unsee ARG VERSION RUN apk add --update make git From d0233d85110f42cc44009bfd9675a03ba85a5bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 5 Jul 2018 23:38:15 +0200 Subject: [PATCH 2/2] chore(node): update snapshots for jest tests Those tests should be fixed to not be time depended, but new UI is comming and this code will soon disappear --- assets/static/__snapshots__/silence.test.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/static/__snapshots__/silence.test.js.snap b/assets/static/__snapshots__/silence.test.js.snap index 8c674ea2e..07cb3a3ce 100644 --- a/assets/static/__snapshots__/silence.test.js.snap +++ b/assets/static/__snapshots__/silence.test.js.snap @@ -98,12 +98,12 @@ exports[`silence form 2`] = `