Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow VERSION to be set explicitly #6016

Merged
merged 4 commits into from
Jan 25, 2021
Merged

Conversation

Frassle
Copy link
Member

@Frassle Frassle commented Dec 28, 2020

When building for alpine aports we download the pulumi source from a
github archive (e.g.
https://github.com/pulumi/pulumi/archive/v2.16.0.tar.gz) but this
doesn't include the .git information to allow scripts/get-version to
work.

This patch, which is currently applied on top of the base pulumi
code as part of the alpine build (see [1]), simply allows the alpine
build script to explicitly set the version used. In the alpine build
script this always matches the source code archive version to download.

[1] https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/16281

@Frassle
Copy link
Member Author

Frassle commented Dec 28, 2020

I've been doing some work on the alpine build script today and this patch isn't quite right. I'll do some more testing and get back to this once I've sorted the alpine build out.

When building for alpine aports we download the pulumi source from a
github archive (e.g.
https://github.com/pulumi/pulumi/archive/v2.16.0.tar.gz) but this
doesn't include the .git information to allow scripts/get-version to
work.

This patch, which is currently applied on top of the base pulumi
code as part of the alpine build (see [1]), simply allows the alpine
build script to explicitly set the version used. In the alpine build
script this always matches the source code archive version to download.

[1] https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/16281
@Frassle
Copy link
Member Author

Frassle commented Dec 30, 2020

I've now updated this for the latest version of what I'm using in the alpine pipeline (Still waiting for the merge request to be merged in aports).

@Frassle
Copy link
Member Author

Frassle commented Jan 16, 2021

This patch is now merged on the alpine side. I've got one more large change to the alpine pipeline to get it working properly and the only patch needed to the base pulumi code for that pipeline is what's in this PR.
That is if this PR is merged the alpine pipeline won't have to patch the pulumi source at all to build, which would be nice.

@stack72 stack72 added the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Jan 25, 2021
@stack72
Copy link
Contributor

stack72 commented Jan 25, 2021

/run-acceptance-tests

@github-actions
Copy link

Please view the results of the PR Build + Acceptance Tests Run Here

@stack72
Copy link
Contributor

stack72 commented Jan 25, 2021

Thanks so much for this @Frassle

I was able to get the correct behaviour here:

▶ make dist
DIST:
go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=v2.19.0-alpha.1611576811+g95c03c623" github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet
^Cmake[1]: *** [dist] Interrupt: 2
make: *** [sdk/dotnet_dist] Interrupt: 2


github.com/pulumi/pulumi  Frassle-explictversion ✔                                                                                                                                     0m  ⍉
▶ PULUMI_VERSION=v100.x make dist
DIST:
go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=v100.x" github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet
^Cmake[1]: *** [dist] Interrupt: 2
make: *** [sdk/dotnet_dist] Interrupt: 2

I just kicked off a set of acceptance tests to ensure our build process works as expected and will merge on a green build!

Thanks again

Paul

@stack72 stack72 merged commit 4fc745d into pulumi:master Jan 25, 2021
@Frassle Frassle deleted the explictversion branch January 25, 2021 22:14
@github-actions
Copy link

Please view the results of the PR Build + Acceptance Tests Run Here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/no-changelog-required This issue doesn't require a CHANGELOG update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants