Compare commits

..

No commits in common. "main" and "v8.2.2-22" have entirely different histories.

3 changed files with 6 additions and 21 deletions

View file

@ -9,8 +9,8 @@ jobs:
container: container:
image: ubuntu:22.04 image: ubuntu:22.04
env: env:
pkgver: 8.3.3 pkgver: 8.2.2
buildno: 21 buildno: 22
qtver: 5.15.3 qtver: 5.15.3
steps: steps:
- name: Environment setup - name: Environment setup
@ -18,7 +18,6 @@ jobs:
cat /etc/os-release cat /etc/os-release
apt-get update 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 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 - curl -sL https://deb.nodesource.com/setup_16.x | bash -
apt-get install -y nodejs apt-get install -y nodejs
npm install -g pkg grunt grunt-cli npm install -g pkg grunt grunt-cli
@ -37,7 +36,6 @@ jobs:
cd build 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/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/disable-licensing-limits.patch
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_common-officefileformatchecker2-add-limits-include.patch
- name: Development setup - name: Development setup
run: | run: |
mkdir -p build/build_tools/system_qt-$qtver/gcc_64 mkdir -p build/build_tools/system_qt-$qtver/gcc_64

View file

@ -1,12 +0,0 @@
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"

View file

@ -119,10 +119,10 @@ index 2209e8c9..feef6247 100644
} else { } else {
const converter = require('./converter'); const converter = require('./converter');
diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js
index d43ee210..9e787b08 100644 index 8813cbac..90177d15 100644
--- a/server/Common/sources/license.js --- a/server/Common/sources/license.js
+++ b/server/Common/sources/license.js +++ b/server/Common/sources/license.js
@@ -44,24 +44,24 @@ exports.readLicense = async function () { @@ -44,23 +44,23 @@ exports.readLicense = async function () {
return [{ return [{
count: 1, count: 1,
type: c_LR.Success, type: c_LR.Success,
@ -149,9 +149,8 @@ index d43ee210..9e787b08 100644
- endDate: null, - endDate: null,
+ endDate: new Date("2099-01-01T23:59:59.000Z"), + endDate: new Date("2099-01-01T23:59:59.000Z"),
customerId: "", customerId: "",
- alias: "", - alias: ""
+ alias: "community", + alias: "community"
multitenancy: false
}, null]; }, null];
}; };