Skip to content

Commit

Permalink
Re-enabling dockerfile latest, docs and homebrew publishing
Browse files Browse the repository at this point in the history
These had previously been disabled due to the beta releases. Also
fixes an import path for finding an executable
  • Loading branch information
stack72 committed Apr 14, 2020
1 parent 66bd3f4 commit 74df34b
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/pulumi/new.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions pkg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 0 additions & 2 deletions pkg/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-and-publish-docker
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/publish_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sdk/go/common/util/executable/executable.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 74df34b

Please sign in to comment.