This commit is contained in:
parent
eb3f0d793f
commit
23da6c4369
2 changed files with 30 additions and 9 deletions
|
@ -10,12 +10,13 @@ jobs:
|
||||||
env:
|
env:
|
||||||
pkgver: 8.1.1
|
pkgver: 8.1.1
|
||||||
buildno: 39
|
buildno: 39
|
||||||
|
qtver: 5.15.3
|
||||||
steps:
|
steps:
|
||||||
- name: Environment setup
|
- name: Environment setup
|
||||||
run: |
|
run: |
|
||||||
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
|
apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper
|
||||||
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
|
||||||
|
@ -28,27 +29,33 @@ jobs:
|
||||||
git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno build/document-server-integration
|
git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno build/document-server-integration
|
||||||
git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno build/document-templates
|
git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno build/document-templates
|
||||||
git clone https://github.com/ONLYOFFICE/onlyoffice.github.io build/onlyoffice.github.io
|
git clone https://github.com/ONLYOFFICE/onlyoffice.github.io build/onlyoffice.github.io
|
||||||
|
git clone https://github.com/ONLYOFFICE/document-server-package.git -b $pkgver.$buildno build/document-server-package
|
||||||
- name: Applying patches
|
- name: Applying patches
|
||||||
run: |
|
run: |
|
||||||
git -C build/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch
|
git -C build/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch
|
||||||
git -C build/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.patch
|
git -C build/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.patch
|
||||||
|
git -C build apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
|
||||||
- name: Development setup
|
- name: Development setup
|
||||||
run: |
|
run: |
|
||||||
mkdir -p build/build_tools/system_qt/gcc_64
|
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
|
||||||
ln -s /usr/lib/x86_64-linux-gnu build/build_tools/system_qt/gcc_64/lib
|
ln -s /usr/lib/x86_64-linux-gnu build/build_tools/system_qt-$qtver/gcc_64/lib
|
||||||
ln -s /usr/lib/x86_64-linux-gnu/qt5/bin build/build_tools/system_qt/gcc_64/bin
|
ln -s /usr/lib/x86_64-linux-gnu/qt5/bin build/build_tools/system_qt-$qtver/gcc_64/bin
|
||||||
ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins build/build_tools/system_qt/gcc_64/plugins
|
ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins build/build_tools/system_qt-$qtver/gcc_64/plugins
|
||||||
cd build/build_tools/tools/linux
|
cd build/build_tools/tools/linux
|
||||||
python2 ./deps.py
|
python2 ./deps.py
|
||||||
- name: Onlyoffice server build
|
- name: Build server
|
||||||
run: |
|
run: |
|
||||||
cd build/build_tools
|
cd build/build_tools
|
||||||
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt
|
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt-$qtver
|
||||||
python2 ./make.py
|
python2 ./make.py
|
||||||
|
- name: Build package
|
||||||
|
run: |
|
||||||
|
cd build/document-server-package
|
||||||
|
PRODUCT_VERSION=$pkgver BUILD_NUMBER=$buildno make deb
|
||||||
- name: Package upload
|
- name: Package upload
|
||||||
uses: forgejo/upload-artifact@v3
|
uses: forgejo/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: documentserver
|
name: documentserver-deb
|
||||||
path: build/build_tools/out/linux_64/onlyoffice/documentserver/*
|
path: build/document-server-package/deb/onlyoffice-documentserver_*.deb
|
||||||
|
|
||||||
|
|
||||||
|
|
14
core_v8-no-enum-constexrp-conversion.patch
Normal file
14
core_v8-no-enum-constexrp-conversion.patch
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
diff --git a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig b/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn
|
||||||
|
index 5ea2f213..29fa7742 100644
|
||||||
|
--- a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig
|
||||||
|
+++ b/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn
|
||||||
|
@@ -1548,6 +1548,9 @@ config("default_warnings") {
|
||||||
|
# TODO(https://crbug.com/989932): Evaluate and possibly enable.
|
||||||
|
"-Wno-implicit-int-float-conversion",
|
||||||
|
|
||||||
|
+ "-Wno-enum-constexpr-conversion",
|
||||||
|
+
|
||||||
|
+
|
||||||
|
# TODO(https://crbug.com/999886): Clean up, enable.
|
||||||
|
"-Wno-final-dtor-non-final-class",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue