Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
007139a8a6 | |||
663a763150 | |||
101f52f9ab | |||
4fa4653f8f |
3 changed files with 21 additions and 6 deletions
|
@ -9,8 +9,8 @@ jobs:
|
|||
container:
|
||||
image: ubuntu:22.04
|
||||
env:
|
||||
pkgver: 8.2.2
|
||||
buildno: 22
|
||||
pkgver: 8.3.3
|
||||
buildno: 21
|
||||
qtver: 5.15.3
|
||||
steps:
|
||||
- name: Environment setup
|
||||
|
@ -18,6 +18,7 @@ jobs:
|
|||
cat /etc/os-release
|
||||
apt-get update
|
||||
apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper clang-14 lld-14
|
||||
# node version set in build_tools/scripts/build_server variable pkg_target
|
||||
curl -sL https://deb.nodesource.com/setup_16.x | bash -
|
||||
apt-get install -y nodejs
|
||||
npm install -g pkg grunt grunt-cli
|
||||
|
@ -36,6 +37,7 @@ jobs:
|
|||
cd build
|
||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
|
||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
|
||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_common-officefileformatchecker2-add-limits-include.patch
|
||||
- name: Development setup
|
||||
run: |
|
||||
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/core/Common/OfficeFileFormatChecker2.cpp b/core/Common/OfficeFileFormatChecker2.cpp
|
||||
index d2887d78..43c28a0b 100644
|
||||
--- a/core/Common/OfficeFileFormatChecker2.cpp
|
||||
+++ b/core/Common/OfficeFileFormatChecker2.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
#include "3dParty/pole/pole.h"
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
#include "OfficeFileFormatDefines.h"
|
||||
|
|
@ -119,10 +119,10 @@ index 2209e8c9..feef6247 100644
|
|||
} else {
|
||||
const converter = require('./converter');
|
||||
diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js
|
||||
index 8813cbac..90177d15 100644
|
||||
index d43ee210..9e787b08 100644
|
||||
--- a/server/Common/sources/license.js
|
||||
+++ b/server/Common/sources/license.js
|
||||
@@ -44,23 +44,23 @@ exports.readLicense = async function () {
|
||||
@@ -44,24 +44,24 @@ exports.readLicense = async function () {
|
||||
return [{
|
||||
count: 1,
|
||||
type: c_LR.Success,
|
||||
|
@ -149,8 +149,9 @@ index 8813cbac..90177d15 100644
|
|||
- endDate: null,
|
||||
+ endDate: new Date("2099-01-01T23:59:59.000Z"),
|
||||
customerId: "",
|
||||
- alias: ""
|
||||
+ alias: "community"
|
||||
- alias: "",
|
||||
+ alias: "community",
|
||||
multitenancy: false
|
||||
}, null];
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue