Compare commits

...

44 commits

Author SHA1 Message Date
b23b60062c
fix patch
All checks were successful
/ test-build (pull_request) Successful in 1h14m42s
2024-08-24 15:49:11 -04:00
2d73ea6e06
fix core patch
Some checks failed
/ test-build (pull_request) Failing after 5m51s
2024-08-24 15:41:37 -04:00
459ecc1486
fix patch
Some checks failed
/ test-build (pull_request) Failing after 4m33s
2024-08-24 14:26:37 -04:00
31accc20ef
add release-build for deployment 2024-08-24 14:25:50 -04:00
812c4710f8
typo
Some checks failed
/ build-test (pull_request) Failing after 4m26s
2024-08-24 14:13:09 -04:00
23da6c4369
add v8 patch, build deb package
Some checks failed
/ build-test (pull_request) Failing after 4m24s
2024-08-24 14:08:20 -04:00
eb3f0d793f
put under build
Some checks failed
/ build-test (pull_request) Failing after 19m26s
2024-08-24 11:12:29 -04:00
7026014a00
cd in build_tools
Some checks failed
/ build-test (pull_request) Failing after 4m12s
2024-08-24 10:51:44 -04:00
491aecdab9
get patches earlier
Some checks failed
/ build-test (pull_request) Failing after 4m53s
2024-08-24 10:45:44 -04:00
bad525a520
add missing run
Some checks failed
/ build-test (pull_request) Failing after 4m7s
2024-08-24 10:40:22 -04:00
d40449db40
dont use pushd popd
Some checks failed
/ build-test (pull_request) Failing after 0s
2024-08-24 10:39:07 -04:00
11e79d4160
Cleanup build steps 2024-08-24 10:38:08 -04:00
aab614a471
use ubuntu:22.04 image
Some checks failed
/ build-test (pull_request) Failing after 4m26s
2024-08-24 10:33:52 -04:00
af061b9928
update 8.1 2024-08-24 10:33:40 -04:00
050817e10d
update
Some checks failed
/ build-test (pull_request) Failing after 4m29s
2024-08-24 10:14:50 -04:00
9f397cb265
downgrade build no 1
Some checks failed
/ build-test (pull_request) Failing after 3m45s
2024-08-23 18:40:51 -04:00
cb7d283416
Revert "downgrade node_14"
Some checks failed
/ build-test (pull_request) Failing after 3m54s
This reverts commit 081e2c2c21.
2024-08-23 18:23:57 -04:00
0c52b5d884
typo
Some checks failed
/ build-test (pull_request) Failing after 2m35s
2024-08-23 18:19:49 -04:00
081e2c2c21
downgrade node_14
Some checks failed
/ build-test (pull_request) Failing after 2m35s
2024-08-23 18:03:54 -04:00
2a0e13c0d3
downgrade 8.0.1.50
Some checks failed
/ build-test (pull_request) Failing after 3m27s
2024-08-23 18:02:28 -04:00
428720e438
typo
Some checks failed
/ build-test (pull_request) Failing after 3m48s
2024-08-23 17:55:22 -04:00
d8b72c1ad7
find patches
Some checks failed
/ build-test (pull_request) Failing after 3m47s
2024-08-23 17:50:46 -04:00
8089a1aa73
add python3 depend
Some checks failed
/ build-test (pull_request) Failing after 3m47s
2024-08-23 17:45:27 -04:00
3bb039e9c2
use existing version
Some checks failed
/ build-test (pull_request) Failing after 1m16s
2024-08-23 17:43:39 -04:00
f4c50c9bab
use onlyoffice/documentserver image
Some checks failed
/ build-test (pull_request) Failing after 0s
2024-08-23 17:41:32 -04:00
4a0a7e0ebd
use older checkout
Some checks failed
/ build-test (pull_request) Failing after 1m55s
2024-08-23 17:38:14 -04:00
d9b85940ac
try direct builddeps
Some checks failed
/ build-test (pull_request) Failing after 1m54s
2024-08-23 17:35:39 -04:00
0d222eea9b
use nodesource curl
Some checks failed
/ build-test (pull_request) Failing after 1m57s
2024-08-23 17:32:54 -04:00
7aff5cf496
do not &&
Some checks failed
/ build-test (pull_request) Failing after 48s
2024-08-23 16:54:53 -04:00
b522b5f66e
get lsb-release
Some checks failed
/ build-test (pull_request) Failing after 49s
2024-08-23 16:53:40 -04:00
35b298d9d7
get curl
Some checks failed
/ build-test (pull_request) Failing after 48s
2024-08-23 16:52:09 -04:00
389c9d5535
install nodejs16
Some checks failed
/ build-test (pull_request) Failing after 46s
2024-08-23 16:51:08 -04:00
2566f68d23
link nodejs and node
Some checks failed
/ build-test (pull_request) Failing after 5m14s
2024-08-23 16:32:14 -04:00
17f12cc751
add npm
Some checks failed
/ build-test (pull_request) Failing after 1m15s
2024-08-23 16:30:29 -04:00
649398c5e7
get node
Some checks failed
/ build-test (pull_request) Failing after 25s
2024-08-23 16:27:49 -04:00
2b3fa22d16
get nodejs and patch
Some checks failed
/ build-test (pull_request) Failing after 44s
2024-08-23 16:26:27 -04:00
cadb641aab
fix yaml
Some checks failed
/ build-test (pull_request) Failing after 56s
2024-08-23 16:25:22 -04:00
fdeaf414e1
fix git 2024-08-23 16:23:18 -04:00
ae6618abc4
git clone with submodules 2024-08-23 16:21:53 -04:00
3e1151d01b
try different (patchable) approach 2024-08-23 16:19:58 -04:00
3911d3b318
apt update
Some checks failed
/ build-test (pull_request) Failing after 37m44s
2024-08-23 15:59:20 -04:00
1efe7a7eb3
get sudo
Some checks failed
/ build-test (pull_request) Failing after 16s
2024-08-23 15:58:40 -04:00
f51fb404cc
attempt build
Some checks failed
/ build-test (pull_request) Failing after 16s
2024-08-23 15:57:28 -04:00
ea6d80a3de
use 16.04
All checks were successful
/ build-test (pull_request) Successful in 19s
2024-08-23 15:55:10 -04:00
4 changed files with 170 additions and 5 deletions

View file

@ -0,0 +1,81 @@
on:
push:
tags:
- 'v*'
jobs:
release-build:
runs-on: x86_64
container:
image: ubuntu:22.04
env:
pkgver: 8.1.1
buildno: 39
qtver: 5.15.3
steps:
- name: Environment setup
run: |
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
curl -sL https://deb.nodesource.com/setup_16.x | bash -
apt-get install -y nodejs
npm install -g pkg grunt grunt-cli
- name: Getting patches
uses: actions/checkout@v4
- name: Cloning source
run: |
git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver build
git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno build/build_tools
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/onlyoffice.github.io build/onlyoffice.github.io
git clone https://github.com/ONLYOFFICE/document-server-package.git -b v$pkgver.$buildno build/document-server-package
- name: Applying patches
run: |
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 apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
- name: Development setup
run: |
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
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-$qtver/gcc_64/bin
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
python2 ./deps.py
- name: Build server
run: |
cd build/build_tools
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt-$qtver
python2 ./make.py
- name: Build package
run: |
cd build/document-server-package
PRODUCT_VERSION=$pkgver BUILD_NUMBER=$buildno make deb
- name: Package upload
uses: forgejo/upload-artifact@v3
with:
name: documentserver-deb
path: build/document-server-package/deb/onlyoffice-documentserver_*.deb
release-deploy:
needs: [release-build]
runs-on: x86_64
container:
image: alpine:latest
env:
CI_RPM_REPO: 'https://ayakael.net/api/packages/forge/'
FORGE_REPO_TOKEN: ${{ secrets.FORGE_REPO_TOKEN }}
FORGE_REPO_PRIVKEY: ${{ secrets.FORGE_REPO_PRIVKEY }}
FORGE_REPO_USER: ${{ vars.FORGE_REPO_USER }}
steps:
- name: Setting up environment
run: apk add nodejs curl findutils git gawk bash
- name: Repo pull
uses: actions/checkout@v4
- name: Package download
uses: forgejo/download-artifact@v3
- name: Package deployment
run: curl --user ${{ vars.FORGE_REPO_USER }}:${{ secrets.FORGE_REPO_PRIVKEY }} --upload-file */onlyoffice-documentserver_*.deb https://forgejo.example.com/api/packages/ilot/debian/pool/jammy/main/upload

View file

@ -3,10 +3,59 @@ on:
types: [ assigned, opened, synchronize, reopened ]
jobs:
build-test:
test-build:
runs-on: x86_64
container:
image: onlyoffice/documentserver-builder
image: ubuntu:22.04
env:
pkgver: 8.1.1
buildno: 39
qtver: 5.15.3
steps:
- name: Environment setup
run: cat /etc/os-release
run: |
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
curl -sL https://deb.nodesource.com/setup_16.x | bash -
apt-get install -y nodejs
npm install -g pkg grunt grunt-cli
- name: Getting patches
uses: actions/checkout@v4
- name: Cloning source
run: |
git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver build
git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno build/build_tools
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/onlyoffice.github.io build/onlyoffice.github.io
git clone https://github.com/ONLYOFFICE/document-server-package.git -b v$pkgver.$buildno build/document-server-package
- name: Applying patches
run: |
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 apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
- name: Development setup
run: |
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
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-$qtver/gcc_64/bin
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
python2 ./deps.py
- name: Build server
run: |
cd build/build_tools
python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt-$qtver
python2 ./make.py
- name: Build package
run: |
cd build/document-server-package
PRODUCT_VERSION=$pkgver BUILD_NUMBER=$buildno make deb
- name: Package upload
uses: forgejo/upload-artifact@v3
with:
name: documentserver-deb
path: build/document-server-package/deb/onlyoffice-documentserver_*.deb

View file

@ -0,0 +1,34 @@
diff --git a/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
new file mode 100644
index 0000000000..5a1a8067a6
--- /dev/null
+++ b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
@@ -0,0 +1,14 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 5ea2f213..29fa7742 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/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",
+
diff --git a/build_tools/scripts/core_common/modules/v8_89.py b/core/build_tools/core_common/modules/v8_89.py
index 9643263..35ee1fe 100644
--- a/build_tools/scripts/core_common/modules/v8_89.py
+++ b/build_tools/scripts/core_common/modules/v8_89.py
@@ -150,6 +150,8 @@ def make():
"use_custom_libcxx=false",
"treat_warnings_as_errors=false"]
+ base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"])
+
if config.check_option("platform", "linux_64"):
base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")])
base.cmd("ninja", ["-C", "out.gn/linux_64"])

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