Compare commits

..

No commits in common. "aab614a471160f3251aaa28b652f74da7fa01570" and "050817e10d5eca674e421d63e4598ef1d462a720" have entirely different histories.

2 changed files with 5 additions and 7 deletions

View file

@ -6,7 +6,7 @@ jobs:
build-test:
runs-on: x86_64
container:
image: ubuntu:22.04
image: onlyoffice/documentserver:8.1.1.2
env:
pkgver: 8.1.1
buildno: 39
@ -17,6 +17,7 @@ jobs:
apt-get update
apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev
curl -sL https://deb.nodesource.com/setup_16.x | bash -
apt-get update
apt-get install -y nodejs
npm install -g pkg grunt grunt-cli
- name: Getting patches
@ -42,9 +43,7 @@ jobs:
ln -s /usr/lib/x86_64-linux-gnu ./system_qt/gcc_64/lib
ln -s /usr/lib/x86_64-linux-gnu/qt5/bin ./system_qt/gcc_64/bin
ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins ./system_qt/gcc_64/plugins
pushd tools/linux
python2 ./deps.py
popd
python2 ./build_tools/tools/linux/deps.py
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt
python2 ./make.py
- name: Package upload

View file

@ -57,7 +57,7 @@ diff --git a/DocService/sources/server.js b/DocService/sources/server.js
index 76303af9..9d2e6888 100644
--- a/DocService/sources/server.js
+++ b/DocService/sources/server.js
@@ -129,7 +129,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
@@ -109,7 +109,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
}
updateLicense();
@ -65,8 +65,7 @@ index 76303af9..9d2e6888 100644
+// fs.watchFile(cfgLicenseFile, updateLicense);
setInterval(updateLicense, 86400000);
try {
if (config.has('services.CoAuthoring.server.static_content')) {
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
index 46615032..6ce2d3e6 100644
--- a/FileConverter/sources/convertermaster.js