Compare commits
2 commits
050817e10d
...
aab614a471
Author | SHA1 | Date | |
---|---|---|---|
aab614a471 | |||
af061b9928 |
2 changed files with 7 additions and 5 deletions
|
@ -6,7 +6,7 @@ jobs:
|
||||||
build-test:
|
build-test:
|
||||||
runs-on: x86_64
|
runs-on: x86_64
|
||||||
container:
|
container:
|
||||||
image: onlyoffice/documentserver:8.1.1.2
|
image: ubuntu:22.04
|
||||||
env:
|
env:
|
||||||
pkgver: 8.1.1
|
pkgver: 8.1.1
|
||||||
buildno: 39
|
buildno: 39
|
||||||
|
@ -17,7 +17,6 @@ jobs:
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev
|
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 -
|
curl -sL https://deb.nodesource.com/setup_16.x | bash -
|
||||||
apt-get update
|
|
||||||
apt-get install -y nodejs
|
apt-get install -y nodejs
|
||||||
npm install -g pkg grunt grunt-cli
|
npm install -g pkg grunt grunt-cli
|
||||||
- name: Getting patches
|
- name: Getting patches
|
||||||
|
@ -43,7 +42,9 @@ jobs:
|
||||||
ln -s /usr/lib/x86_64-linux-gnu ./system_qt/gcc_64/lib
|
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/bin ./system_qt/gcc_64/bin
|
||||||
ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins ./system_qt/gcc_64/plugins
|
ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins ./system_qt/gcc_64/plugins
|
||||||
python2 ./build_tools/tools/linux/deps.py
|
pushd tools/linux
|
||||||
|
python2 ./deps.py
|
||||||
|
popd
|
||||||
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt
|
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt
|
||||||
python2 ./make.py
|
python2 ./make.py
|
||||||
- name: Package upload
|
- name: Package upload
|
||||||
|
|
|
@ -57,7 +57,7 @@ diff --git a/DocService/sources/server.js b/DocService/sources/server.js
|
||||||
index 76303af9..9d2e6888 100644
|
index 76303af9..9d2e6888 100644
|
||||||
--- a/DocService/sources/server.js
|
--- a/DocService/sources/server.js
|
||||||
+++ b/DocService/sources/server.js
|
+++ b/DocService/sources/server.js
|
||||||
@@ -109,7 +109,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
|
@@ -129,7 +129,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
|
||||||
}
|
}
|
||||||
|
|
||||||
updateLicense();
|
updateLicense();
|
||||||
|
@ -65,7 +65,8 @@ index 76303af9..9d2e6888 100644
|
||||||
+// fs.watchFile(cfgLicenseFile, updateLicense);
|
+// fs.watchFile(cfgLicenseFile, updateLicense);
|
||||||
setInterval(updateLicense, 86400000);
|
setInterval(updateLicense, 86400000);
|
||||||
|
|
||||||
if (config.has('services.CoAuthoring.server.static_content')) {
|
try {
|
||||||
|
|
||||||
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
|
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
|
||||||
index 46615032..6ce2d3e6 100644
|
index 46615032..6ce2d3e6 100644
|
||||||
--- a/FileConverter/sources/convertermaster.js
|
--- a/FileConverter/sources/convertermaster.js
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue