maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

duplicate version to ensure linking is properly handled

Browse source
This commit is contained in:
evanboyle 2020-03-19 12:49:34 -07:00
parent a2b368827f
commit 1fec5692a5
13 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -42,13 +42,13 @@ generate::
go generate ./pkg/codegen/docs/
build::
go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${PROJECT}
go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
install::
GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${PROJECT}
GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
dist::
go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${PROJECT}
go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
lint::
for DIR in "examples" "pkg" "sdk" "tests" ; do \

18
build.proj
View file

@ -66,7 +66,7 @@
<ItemGroup>
<DotNetPackagesToBuild Include="github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet" />
</ItemGroup>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)" />
</Target>
<Target Name="DotNetInstallPlugin">
@ -76,7 +76,7 @@
<Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
EnvironmentVariables="GOBIN=$(PulumiBin)"/>
</Target>
@ -101,7 +101,7 @@
<ItemGroup>
<GoPackagesToBuild Include="github.com/pulumi/pulumi/sdk/go/pulumi-language-go" />
</ItemGroup>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)" />
</Target>
<Target Name="GoInstallPlugin">
@ -111,7 +111,7 @@
<Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)"
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)"
EnvironmentVariables="GOBIN=$(PulumiBin)"/>
</Target>
@ -148,7 +148,7 @@
<ItemGroup>
<NodeJSPackagesToBuild Include="github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs" />
</ItemGroup>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)" />
</Target>
<Target Name="NodeJSInstallPlugin">
@ -163,7 +163,7 @@
<Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)"
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)"
EnvironmentVariables="GOBIN=$(PulumiBin)"/>
</Target>
@ -221,7 +221,7 @@
<ItemGroup>
<PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" />
</ItemGroup>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" />
</Target>
<Target Name="PythonInstallPlugin">
@ -241,7 +241,7 @@
<Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)"
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)"
EnvironmentVariables="GOBIN=$(PulumiBin)"/>
</Target>
@ -255,7 +255,7 @@
<Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PulumiPackagesToBuild.Identity)"
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(PulumiPackagesToBuild.Identity)"
EnvironmentVariables="GOBIN=$(PulumiBin)"/>
</Target>

2
main.go
View file

@ -21,8 +21,8 @@ import (
"runtime/debug"
"github.com/pulumi/pulumi/pkg/cmd"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/go/common/version"
)
func panicHandler() {

2
pkg/backend/httpstate/client/api.go
View file

@ -34,11 +34,11 @@ import (
"github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/util/tracing"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/apitype"
"github.com/pulumi/pulumi/sdk/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
"github.com/pulumi/pulumi/sdk/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/go/common/version"
)
const (

2
pkg/backend/snapshot.go
View file

@ -23,10 +23,10 @@ import (
"github.com/pulumi/pulumi/pkg/engine"
"github.com/pulumi/pulumi/pkg/resource/deploy"
"github.com/pulumi/pulumi/pkg/secrets"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/resource"
"github.com/pulumi/pulumi/sdk/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/go/common/version"
)
// SnapshotPersister is an interface implemented by our backends that implements snapshot

2
pkg/backend/snapshot_test.go
View file

@ -23,9 +23,9 @@ import (
"github.com/pulumi/pulumi/pkg/resource/deploy"
"github.com/pulumi/pulumi/pkg/secrets"
"github.com/pulumi/pulumi/pkg/secrets/b64"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/resource"
"github.com/pulumi/pulumi/sdk/go/common/tokens"
"github.com/pulumi/pulumi/sdk/go/common/version"
)
type MockRegisterResourceEvent struct {

2
pkg/cmd/pulumi.go
View file

@ -39,13 +39,13 @@ import (
"github.com/pulumi/pulumi/pkg/backend/filestate"
"github.com/pulumi/pulumi/pkg/backend/httpstate"
"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/diag"
"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
"github.com/pulumi/pulumi/sdk/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/go/common/version"
"github.com/pulumi/pulumi/sdk/go/common/workspace"
)

2
pkg/cmd/version.go
View file

@ -17,8 +17,8 @@ package cmd
import (
"fmt"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/go/common/version"
"github.com/spf13/cobra"
)

2
pkg/resource/deploy/plan_test.go
View file

@ -6,10 +6,10 @@ import (
"github.com/pulumi/pulumi/pkg/secrets/b64"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/resource"
"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/go/common/tokens"
"github.com/pulumi/pulumi/sdk/go/common/version"
"github.com/stretchr/testify/assert"
)

2
pkg/resource/edit/operations_test.go
View file

@ -22,9 +22,9 @@ import (
"github.com/pulumi/pulumi/pkg/resource/deploy"
"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
"github.com/pulumi/pulumi/pkg/version"
"github.com/pulumi/pulumi/sdk/go/common/resource"
"github.com/pulumi/pulumi/sdk/go/common/tokens"
"github.com/pulumi/pulumi/sdk/go/common/version"
"github.com/stretchr/testify/assert"
)

18
pkg/version/version.go Normal file
View file

@ -0,0 +1,18 @@
// Copyright 2016-2018, Pulumi Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package version
// Version is initialized by the Go linker to contain the semver of this build.
var Version string

2
scripts/make_release.ps1
View file

@ -13,7 +13,7 @@ $PublishTargets = @($GitHash, $Version, $Branch)
function RunGoBuild($goPackage) {
$binRoot = New-Item -ItemType Directory -Force -Path "$PublishDir\bin"
$outputName = Split-Path -Leaf $(go list -f "{{.Target}}" $goPackage)
go build -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$Version" -o "$binRoot\$outputName" $goPackage
go build -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=$Version" -o "$binRoot\$outputName" $goPackage
}
function CopyPackage($pathToModule, $moduleName) {

2
scripts/make_release.sh
View file

@ -25,7 +25,7 @@ run_go_build() {
mkdir -p "${PUBDIR}/bin"
go build \
-ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" \
-ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" \
-o "${PUBDIR}/bin/${output_name}${bin_suffix}" \
"$1"
}