diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:33:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:34:10 +0000 |
| commit | 83ba6762cc43d9db581b979bb5e3445669e46cc2 (patch) | |
| tree | 2e69833b43f791ed253a7a20318b767ebe56cdb8 /.github/scripts | |
| parent | Releasing debian version 1.47.5-1. (diff) | |
| download | netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.tar.xz netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.zip | |
Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github/scripts')
| -rwxr-xr-x | .github/scripts/check-updater.sh | 1 | ||||
| -rwxr-xr-x | .github/scripts/prepare-release-base.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.github/scripts/check-updater.sh b/.github/scripts/check-updater.sh index 3df0c9de4..73de6d587 100755 --- a/.github/scripts/check-updater.sh +++ b/.github/scripts/check-updater.sh @@ -9,6 +9,7 @@ check_successful_update() { ( netdata_version=$(netdata -v | awk '{print $2}') updater_version=$(cat packaging/version) + echo "Version: netdata '$netdata_version', updater '$updater_version'" if [ "$netdata_version" = "$updater_version" ]; then echo "Update successful!" else diff --git a/.github/scripts/prepare-release-base.sh b/.github/scripts/prepare-release-base.sh index 85bcb7a31..c89cc72b6 100755 --- a/.github/scripts/prepare-release-base.sh +++ b/.github/scripts/prepare-release-base.sh @@ -178,6 +178,7 @@ elif [ "${EVENT_TYPE}" = 'major' ] && [ "${EVENT_VERSION}" != "nightly" ]; then echo "ref=${EVENT_VERSION}" >> "${GITHUB_OUTPUT}" echo "type=release" >> "${GITHUB_OUTPUT}" echo "branch=master" >> "${GITHUB_OUTPUT}" + echo "new-branch=${branch_name}" >> "${GITHUB_OUTPUT}" echo "version=$(tr -d 'v' < packaging/version)" >> "${GITHUB_OUTPUT}" else echo '::error::Unrecognized release type or invalid version.' |