From b0efb6960dde30361b6eeda6e45b731df8881be5 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Tue, 19 Dec 2017 18:11:51 -0800 Subject: [PATCH 1/2] Check that worktree is clean before running Without this, we miss cases where the lock files may need to be updated and we encode a version like v0.9.5-dirty. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6e4308bd7..612ebf10d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,9 @@ install: # Clone the Pulumi-wide repo so we can use its scripts. - git clone git@github.com:pulumi/home ${GOPATH}/src/github.com/pulumi/home - make ensure +before_script: + # Ensure the working tree is clean (make ensure may have updated lock files) + - ${GOPATH}/src/github.com/pulumi/home/scripts/check-worktree-is-clean.sh script: - make travis_${TRAVIS_EVENT_TYPE} TEST_FAST_TIMEOUT=10m notifications: From 0e8272746ec190377edf5233fe0bda02aec1ef29 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Tue, 19 Dec 2017 18:27:37 -0800 Subject: [PATCH 2/2] Update lockfile At some point it got out of date with what is in the tree, leading dep ensure to always do a solve and pend changes to the lock file. --- Gopkg.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0a93a9155..5ea0138fe 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -243,6 +243,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "79bc7379ccff63e1fa7f1b601455b368368e26e44742350c82f2bf44adbdb733" + inputs-digest = "ac5550bbf6f0b4eb66c683d5ac3a605fc5ecf4b3055b0763122555230f5d4577" solver-name = "gps-cdcl" solver-version = 1