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

Support version upgrade for MSI packages #1808

Merged
merged 17 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions tools/packaging/windows/aws-otel-collector.wxs
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
<Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
Name="ADOT Collector"
Version="0.0.1"
Version="0.25.0"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">



<Package Id='*'
Keywords='Installer'
Description="ADOT Collector Installer"
Expand All @@ -20,6 +22,12 @@ SummaryCodepage='1252'
InstallScope="perMachine"
Platform="x64"
/>

<MajorUpgrade
AllowDowngrades="no"
DowngradeErrorMessage="A later version of ADOT Collector is already installed. Setup will now exit"
AllowSameVersionUpgrades="no" />

<MediaTemplate EmbedCab="yes"/>

<Feature Id="ProductFeature" Title="ADOT Collector" Level="1">
Expand Down
4 changes: 4 additions & 0 deletions tools/release/bump-version-and-create-release-note.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ docker run --rm -it -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-chan
# bump the version
echo "${RELEASE_VERSION}" >VERSION

#Update aws-otel-collector msi file.
bryan-aguilar marked this conversation as resolved.
Show resolved Hide resolved
# Note: Only supports [0-9]*.[0-9]*.[0-9]* version pattern. If we decide to release with a full sem ver vX.XX.XX-prerelease then the .wxs file will need to be manually updated
sed -i '' "s/^Version\=\"[0-9]*.[0-9]*.[0-9]*\"/Version=\"${RELEASE_VERSION:1}\"/" tools/packaging/windows/aws-otel-collector.wxs
Kausik-A marked this conversation as resolved.
Show resolved Hide resolved

# git commit
git add VERSION "docs/releases/${RELEASE_VERSION}.md"
git commit -m "bump version to ${RELEASE_VERSION}"