From 74df34be754b2440f52d8e26346b39cb50570544 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Tue, 14 Apr 2020 09:40:11 +0100
Subject: [PATCH] Re-enabling dockerfile latest, docs and homebrew publishing

These had previously been disabled due to the beta releases. Also
fixes an import path for finding an executable
---
 .travis.yml                                 | 2 +-
 pkg/cmd/pulumi/new.go                       | 2 +-
 pkg/go.mod                                  | 1 +
 pkg/go.sum                                  | 2 --
 scripts/build-and-publish-docker            | 2 +-
 scripts/publish_packages.sh                 | 2 +-
 sdk/go/common/util/executable/executable.go | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e03bb7581ca..956eac5d883a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_script:
 - "${PULUMI_SCRIPTS}/ci/ensure-dependencies"
 script:
 - make travis_${TRAVIS_EVENT_TYPE}
-#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./scripts/update_homebrew.sh; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./scripts/update_homebrew.sh; fi
 after_failure:
 - "${PULUMI_SCRIPTS}/ci/upload-failed-tests"
 notifications:
diff --git a/pkg/cmd/pulumi/new.go b/pkg/cmd/pulumi/new.go
index 951f3c4595b8..c62df330f7eb 100644
--- a/pkg/cmd/pulumi/new.go
+++ b/pkg/cmd/pulumi/new.go
@@ -43,7 +43,7 @@ import (
 	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
-  "github.com/pulumi/pulumi/sdk/v2/go/common/util/executable"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/executable"
 	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
diff --git a/pkg/go.mod b/pkg/go.mod
index 35cec28c40c0..c47e39da23bf 100644
--- a/pkg/go.mod
+++ b/pkg/go.mod
@@ -5,6 +5,7 @@ go 1.13
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
 	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.5.0
+	github.com/pulumi/pulumi/sdk/v2 => ../sdk
 	gocloud.dev => github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f
 )
 
diff --git a/pkg/go.sum b/pkg/go.sum
index 0495a8b28750..c054fa58a1c6 100644
--- a/pkg/go.sum
+++ b/pkg/go.sum
@@ -389,8 +389,6 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f h1:5joKrli3VwNBIgG+Jnfj41wIHxvcg0PpdPzNdmQC4Zw=
 github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f/go.mod h1:lhLOb91+9tKB8RnNlsx+weJGEd0AHM94huK1bmrhPwM=
-github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2 h1:qjZFBvcMToKexdKfUHiCP0mBvwxvvrnLJMMAmZGxJrQ=
-github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2/go.mod h1:v+a8Lg5wKLfMKvFMlBhosoXF+IO6kWiu20YFaWQ4Ygg=
 github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
 github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
diff --git a/scripts/build-and-publish-docker b/scripts/build-and-publish-docker
index 144fb526a528..4b4ab6501c62 100755
--- a/scripts/build-and-publish-docker
+++ b/scripts/build-and-publish-docker
@@ -61,7 +61,7 @@ echo "Publishing containers..."
 for container in pulumi actions; do
     echo "- pulumi/${container}"
     docker push "pulumi/${container}:${CLI_VERSION}"
-    #docker push "pulumi/${container}:latest"
+    docker push "pulumi/${container}:latest"
 done
 
 docker logout
diff --git a/scripts/publish_packages.sh b/scripts/publish_packages.sh
index 8e7667b452c0..e4e1b5098068 100755
--- a/scripts/publish_packages.sh
+++ b/scripts/publish_packages.sh
@@ -66,7 +66,7 @@ if [[ "${TRAVIS_PUBLISH_PACKAGES:-}" == "true" ]]; then
 
     "${ROOT}/scripts/build-and-publish-docker" "${NPM_VERSION}"
 
-    #"$(go env GOPATH)/src/github.com/pulumi/scripts/ci/build-package-docs.sh" pulumi
+    "$(go env GOPATH)/src/github.com/pulumi/scripts/ci/build-package-docs.sh" pulumi
 fi
 
 exit 0
diff --git a/sdk/go/common/util/executable/executable.go b/sdk/go/common/util/executable/executable.go
index 12684347e81f..c53fd49f7984 100644
--- a/sdk/go/common/util/executable/executable.go
+++ b/sdk/go/common/util/executable/executable.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 const unableToFindProgramTemplate = "unable to find program: %s"