Skip to content

Commit e9e4749

Browse files
pass --is-prerelease if last tag contains some prelease label
1 parent 9a726bd commit e9e4749

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ NODE_MODULE_NAME := @defang-io/pulumi-defang
77
NUGET_PKG_NAME := DefangLabs.defang
88

99
PROVIDER := pulumi-resource-${PACK}
10-
VERSION ?= $(shell pulumictl get version)
10+
VERSION ?= $(shell pulumictl get version $(if $(filter 0,$(IS_PRERELEASE)),--is-prerelease))
1111
PROVIDER_PATH := provider
1212
VERSION_PATH := ${PROVIDER_PATH}.Version
13+
IS_PRERELEASE := $(shell git tag --list | tail -n1 | grep -q "alpha\|beta\|rc\|preview"; echo $$?)
1314

1415
GOPATH := $(shell go env GOPATH)
1516

@@ -61,7 +62,7 @@ provider_debug:
6162
test_provider:
6263
cd tests && go test -short -v -count=1 -cover -timeout 5m -parallel ${TESTPARALLELISM} ./...
6364

64-
dotnet_sdk: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
65+
dotnet_sdk: DOTNET_VERSION := $(shell pulumictl get version --language dotnet $(if $(filter 0,$(IS_PRERELEASE)),--is-prerelease))
6566
dotnet_sdk: provider
6667
rm -rf sdk/dotnet
6768
pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language dotnet
@@ -75,7 +76,7 @@ go_sdk: provider
7576
pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language go
7677

7778
.PHONY: nodejs_sdk
78-
nodejs_sdk: VERSION := $(shell pulumictl get version --language javascript)
79+
nodejs_sdk: VERSION := $(shell pulumictl get version --language javascript $(if $(filter 0,$(IS_PRERELEASE)),--is-prerelease))
7980
nodejs_sdk: provider
8081
rm -rf sdk/nodejs
8182
pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language nodejs
@@ -87,7 +88,7 @@ nodejs_sdk: provider
8788
cp ../../README.md ../../LICENSE package.json yarn.lock bin/
8889

8990
.PHONY: python_sdk
90-
python_sdk: PYPI_VERSION := $(shell pulumictl get version --language python)
91+
python_sdk: PYPI_VERSION := $(shell pulumictl get version --language python $(if $(filter 0,$(IS_PRERELEASE)),--is-prerelease))
9192
python_sdk: provider
9293
rm -rf sdk/python
9394
pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language python

examples/dotnet/provider-defang.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Pulumi" Version="3.*" />
10-
<PackageReference Include="DefangLabs.Defang" Version="1.1.0-alpha.1741727290+56aab005" />
10+
<PackageReference Include="DefangLabs.Defang" Version="1.0.0-beta.7" />
1111
</ItemGroup>
1212

1313
</Project>

examples/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.20
44

55
require (
66
github.com/pulumi/pulumi/sdk/v3 v3.30.0
7-
github.com/DefangLabs/pulumi-defang/sdk v1.1.0-alpha.1741727290+56aab005
7+
github.com/DefangLabs/pulumi-defang/sdk v1.0.0-beta.7
88
)

examples/nodejs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"dependencies": {
77
"typescript": "^4.0.0",
88
"@pulumi/pulumi": "^3.0.0",
9-
"@defang-io/pulumi-defang": "1.1.0-alpha.1741727290+56aab005"
9+
"@defang-io/pulumi-defang": "1.0.0-beta.7"
1010
}
1111
}

examples/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pulumi-defang==1.1.0-alpha.1741727290+56aab005
1+
pulumi-defang==1.0.0-beta.7
22
pulumi>=3.0.0,<4.0.0

0 commit comments

Comments
 (0)