Compare commits

...

4 Commits

Author SHA1 Message Date
matt
98c83cc94e KASM-2053 update novnc commit 2021-11-08 12:18:13 +00:00
Lauri Kasanen
a4e6343be7 EncodeManager: check for changed dynamicQualityMin/Max every frame 2021-11-08 11:49:31 +02:00
Lauri Kasanen
2af6bbc866 Use different path to set PreferBandwidth remotely, just for log prettiness 2021-11-08 11:46:52 +02:00
Dmitry Maksyoma
77b97415ef Add bump-package-version(1) and document it (#74) 2021-11-05 10:05:13 -04:00
8 changed files with 91 additions and 3 deletions

2
.gitmodules vendored
View File

@@ -1,4 +1,4 @@
[submodule "kasmweb"] [submodule "kasmweb"]
path = kasmweb path = kasmweb
url = https://github.com/kasmtech/noVNC.git url = https://github.com/kasmtech/noVNC.git
branch = master branch = bugfix/KASM-2053_video_quality

View File

@@ -79,6 +79,25 @@ packages installed with XFCE.
``` ```
builder/test-deb-barebones ubuntu focal builder/test-deb-barebones ubuntu focal
``` ```
# Preparing a release
Deb and rpm packages need their versions bumped to the new release version. It
can be done with:
```
builder/bump-package-version 0.9.4-beta
```
This will update corresponding package files, use `git diff` to see changes.
If you've ran the command and curious about Debian version specifics, here's an
explanation:
Deb version will be `0.9.4~beta-1`. `~` (and not `-`) is required by packaging
guidelines, and `-1` is Debian package revision for `0.9.4` upstream release. If
a Debian-specific patch was later added on top of `0.9.4`, it'd be `-2` for the
next Debian version. Rpm has a corresponding revision in its .spec file.
# CI development # CI development
S3 upload code is extracted to various files in `.ci`. It's possible to iterate S3 upload code is extracted to various files in `.ci`. It's possible to iterate

41
builder/bump-package-version Executable file
View File

@@ -0,0 +1,41 @@
#!/usr/bin/env bash
set -eo pipefail
update_version_to_meet_packaging_standards() {
new_version=$(echo "$new_version" |
sed -e 's/\([0-9]\)-\([a-zA-Z]\)/\1~\2/')
}
add_debian_revision_to_new_version() {
echo "$new_version-1"
}
bump_rpm() {
sed -i "s/^Version:.\+/Version: $new_version/" centos/kasmvncserver.spec
}
bump_deb() {
local image="debbump_package_version:dev"
local L_UID=$(id -u)
local L_GID=$(id -g)
local debian_version=$(add_debian_revision_to_new_version)
docker build -t "$image" -f builder/dockerfile.bump-package-version .
docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
"$image" /bin/bash -c \
"cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
}
new_version="$1"
if [[ -z "$new_version" ]]; then
echo >&2 "Usage: $(basename "$0") <new_version>"
exit 1
fi
cd "$(dirname "$0")/.."
update_version_to_meet_packaging_standards
bump_rpm
bump_deb

View File

@@ -0,0 +1,15 @@
#!/usr/bin/env bash
set -euo pipefail
new_version="$1"
update_version() {
dch --newversion $new_version 'New upstream release.'
}
mark_as_released() {
dch --release ""
}
update_version
mark_as_released

View File

@@ -0,0 +1,6 @@
FROM debian:buster
ENV DEBEMAIL="Kasm Technologies LLC <info@kasmweb.com>"
RUN apt-get update && \
apt-get -y install vim devscripts

View File

@@ -211,7 +211,7 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
break; break;
case pseudoEncodingPreferBandwidth: case pseudoEncodingPreferBandwidth:
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
Server::preferBandwidth.setParam(); Server::preferBandwidth.setParam(true);
break; break;
case pseudoEncodingMaxVideoResolution: case pseudoEncodingMaxVideoResolution:
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)

View File

@@ -356,6 +356,13 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION]) if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
updateMaxVideoRes(&maxVideoX, &maxVideoY); updateMaxVideoRes(&maxVideoX, &maxVideoY);
// The dynamic quality params may have changed
if (Server::dynamicQualityMax && Server::dynamicQualityMax <= 9 &&
Server::dynamicQualityMax > Server::dynamicQualityMin) {
dynamicQualityMin = Server::dynamicQualityMin;
dynamicQualityOff = Server::dynamicQualityMax - Server::dynamicQualityMin;
}
prepareEncoders(allowLossy); prepareEncoders(allowLossy);
changed = changed_; changed = changed_;

Submodule kasmweb updated: 0bd3813949...1adce75ee1