From e5fafdbc0165245558be6e795820d16e27b2ba36 Mon Sep 17 00:00:00 2001 From: Logic Date: Wed, 18 Sep 2024 23:59:50 +0800 Subject: [PATCH 1/2] chore(release): bump version to 1.6.1Update version numbers in constants, pom.xml, and release script to reflect the new version 1.6.1. Ensure that all necessary files are updated consistently to maintain version integrity across the project. --- pom.xml | 2 +- script/release/release-win.ps1 | 72 +++++++++++++++++++++++++++++ web-app/src/app/shared/constants.ts | 2 +- 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 script/release/release-win.ps1 diff --git a/pom.xml b/pom.xml index d2a11c16e67..0c8039e2fb7 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ - 1.6.0 + 1.6.1 17 ${java.version} diff --git a/script/release/release-win.ps1 b/script/release/release-win.ps1 new file mode 100644 index 00000000000..89aef7f5055 --- /dev/null +++ b/script/release/release-win.ps1 @@ -0,0 +1,72 @@ +$gpgKeyId = "********" + +$version = "1.6.1" +$rcNumber = "rc1" + +$scriptPath = Split-Path -Parent $MyInvocation.MyCommand.Path +$projectPath = (Get-Item (Split-Path -Parent $scriptPath)).Parent.FullName + +$distPath = "$projectPath\dist" + +# Clean up the 'dist' directory +Write-Host "Cleaning up the 'dist' directory..." +Remove-Item -Recurse -Force $distPath\* -ErrorAction SilentlyContinue +New-Item -ItemType Directory -Path $distPath -Force + +# Clean up the 'web-app/dist' directory +Write-Host "Cleaning up the 'web-app/dist' directory..." +$webAppDistPath = "$projectPath\web-app\dist" +Remove-Item -Recurse -Force $webAppDistPath\* -ErrorAction SilentlyContinue +New-Item -ItemType Directory -Path $webAppDistPath -Force +Push-Location -Path $projectPath + +Write-Host "Installing dependencies and packaging web-app..." +Push-Location -Path "web-app" +yarn install +yarn package +Pop-Location + +Write-Host "Building project with Maven..." +mvn clean package -Prelease + +mvn clean install + +Write-Host "Building collector..." +Push-Location -Path "collector" +mvn clean package -Pcluster +Pop-Location + +# package release artifacts +Write-Host "Archiving source code..." +git archive --format=tar.gz --output="dist/apache-hertzbeat-$version-incubating-src.tar.gz" --prefix=apache-hertzbeat-$version-incubating-src/$rcNumber git archive --format=tar.gz --output="dist/apache-hertzbeat-$version-incubating-src.tar.gz" --prefix=apache-hertzbeat-$version-incubating-src/$rcNumber + +# sign release artifacts +Write-Host "Signing release artifacts..." +Push-Location -Path "dist" +Get-ChildItem *.tar.gz | ForEach-Object { + $fileName = $_.Name + Write-Host "Signing $fileName..." + gpg -u $gpgKeyId --armor --output "$fileName.asc" --detach-sig "$fileName" + Write-Host "Generating SHA512 for $fileName..." + $hash = Get-FileHash -Path "$fileName" -Algorithm SHA512 + $hashString = $hash.Hash + "$hashString $fileName" | Out-File "$fileName.sha512" -Append +} +Pop-Location + +# verify signatures +Write-Host "Verifying signatures..." +Push-Location -Path "dist" +Get-ChildItem *.tar.gz | ForEach-Object { + $fileName = $_.Name + Write-Host "Verifying $fileName..." + gpg --verify "$fileName.asc" "$fileName" + Write-Host "Checking SHA512 for $fileName..." + $hash = Get-FileHash -Path "$fileName" -Algorithm SHA512 + if ($hash.Hash -eq $null) { + Write-Host "Hash mismatch for $fileName" + } else { + Write-Host "Hash verified for $fileName" + } +} +Pop-Location \ No newline at end of file diff --git a/web-app/src/app/shared/constants.ts b/web-app/src/app/shared/constants.ts index 74fef9fe979..2d4f03df7db 100644 --- a/web-app/src/app/shared/constants.ts +++ b/web-app/src/app/shared/constants.ts @@ -18,5 +18,5 @@ */ export const CONSTANTS = { - VERSION: 'v1.6.0' + VERSION: 'v1.6.1' }; From 556906bce70d7c3a7a97fbd37370f88b74009e7b Mon Sep 17 00:00:00 2001 From: Logic Date: Thu, 19 Sep 2024 08:12:46 +0800 Subject: [PATCH 2/2] Update release-win.ps1 Signed-off-by: Logic --- script/release/release-win.ps1 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/script/release/release-win.ps1 b/script/release/release-win.ps1 index 89aef7f5055..6e711e9877d 100644 --- a/script/release/release-win.ps1 +++ b/script/release/release-win.ps1 @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + $gpgKeyId = "********" $version = "1.6.1" @@ -69,4 +84,4 @@ Get-ChildItem *.tar.gz | ForEach-Object { Write-Host "Hash verified for $fileName" } } -Pop-Location \ No newline at end of file +Pop-Location