From ea6d80a3dec817788643585255ea2628f4b2785b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 15:55:10 -0400 Subject: [PATCH 01/47] use 16.04 --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 008e492..ca10566 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,7 +6,7 @@ jobs: build-test: runs-on: x86_64 container: - image: onlyoffice/documentserver-builder + image: ubuntu:16.04 steps: - name: Environment setup run: cat /etc/os-release From f51fb404cc86d9b66f02f041523c92d2e5af5664 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 15:57:28 -0400 Subject: [PATCH 02/47] attempt build --- .forgejo/workflows/test-build.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index ca10566..306f970 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -9,4 +9,11 @@ jobs: image: ubuntu:16.04 steps: - name: Environment setup - run: cat /etc/os-release + run: sudo apt-get install -y python git + - name: Cloning build tools + run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v8.1.1.39 + - name: Building onlyoffice + run: | + cd build_tools/tools/linux + ./automate.py server + From 1efe7a7eb3010b9d62f78b63723bf8223e5bc63a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 15:58:40 -0400 Subject: [PATCH 03/47] get sudo --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 306f970..1825408 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -9,7 +9,7 @@ jobs: image: ubuntu:16.04 steps: - name: Environment setup - run: sudo apt-get install -y python git + run: apt-get install -y python git sudo - name: Cloning build tools run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v8.1.1.39 - name: Building onlyoffice From 3911d3b3183c72bfe556bbcfa13b3ee609819cd3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 15:59:20 -0400 Subject: [PATCH 04/47] apt update --- .forgejo/workflows/test-build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 1825408..da00b70 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -9,7 +9,9 @@ jobs: image: ubuntu:16.04 steps: - name: Environment setup - run: apt-get install -y python git sudo + run: | + apt-get update + apt-get install -y python git sudo - name: Cloning build tools run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v8.1.1.39 - name: Building onlyoffice From 3e1151d01b46295649e3e359bbaa9e40a898a55a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:19:58 -0400 Subject: [PATCH 05/47] try different (patchable) approach --- .forgejo/workflows/test-build.yaml | 32 +++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index da00b70..16f101c 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -7,15 +7,41 @@ jobs: runs-on: x86_64 container: image: ubuntu:16.04 + env: + pkgver: 8.1.1 + buildno: 39 steps: - name: Environment setup run: | apt-get update apt-get install -y python git sudo + - name: Getting patches + uses: actions/checkout@v4 + - name: Cloning document server source + run: git clone https://github.com/ONLYOFFICE/DocumentServer -b v$pkgver onlyoffice-document-server - name: Cloning build tools - run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v8.1.1.39 + run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools + - name: Cloning document server integration + run: git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno onlyoffice-document-server/document-server-integration + - name: Cloning document templates + run: git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno onlyoffice-document-server/document-templates + - name: Cloning onlyoffice io + run: git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io + - name: Applying patches + run: | + patch -p1 -d onlyoffice-document-server -i web-apps.patch + patch -p1 -d onlyoffice-document-server -i server.patch - name: Building onlyoffice run: | - cd build_tools/tools/linux - ./automate.py server + cd onlyoffice-document-server/build_tools + ./configure.py \ + --update 0 \ + --module "server" + ./make.py + - name: Package upload + uses: forgejo/upload-artifact@v3 + with: + name: documentserver + path: ./out/linux_64/onlyoffice/documentserver/* + From ae6618abc48244b33993aa218613004579942d48 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:21:53 -0400 Subject: [PATCH 06/47] git clone with submodules --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 16f101c..9282f3f 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -18,7 +18,7 @@ jobs: - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source - run: git clone https://github.com/ONLYOFFICE/DocumentServer -b v$pkgver onlyoffice-document-server + run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive-submodules -b v$pkgver onlyoffice-document-server - name: Cloning build tools run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools - name: Cloning document server integration From fdeaf414e1b0693763de7dd4e7b6d724b2211339 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:23:18 -0400 Subject: [PATCH 07/47] fix git --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 9282f3f..c5191e7 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -18,7 +18,7 @@ jobs: - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source - run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive-submodules -b v$pkgver onlyoffice-document-server + run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server - name: Cloning build tools run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools - name: Cloning document server integration From cadb641aab650716511edfd9ac41108631503edd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:25:22 -0400 Subject: [PATCH 08/47] fix yaml --- .forgejo/workflows/test-build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index c5191e7..36c89d9 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -34,9 +34,7 @@ jobs: - name: Building onlyoffice run: | cd onlyoffice-document-server/build_tools - ./configure.py \ - --update 0 \ - --module "server" + ./configure.py --update 0 --module "server" ./make.py - name: Package upload uses: forgejo/upload-artifact@v3 From 2b3fa22d16fb6f35c9b674d3e98f597d82cdb2bd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:26:27 -0400 Subject: [PATCH 09/47] get nodejs and patch --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 36c89d9..cfb643f 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -14,7 +14,7 @@ jobs: - name: Environment setup run: | apt-get update - apt-get install -y python git sudo + apt-get install -y python git sudo nodejs patch - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From 649398c5e786b4946cb3da6a41eed05fb53c6aba Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:27:49 -0400 Subject: [PATCH 10/47] get node --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index cfb643f..532a2c2 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -14,7 +14,7 @@ jobs: - name: Environment setup run: | apt-get update - apt-get install -y python git sudo nodejs patch + apt-get install -y python git sudo nodejs patch node - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From 17f12cc7516f48e25eb5ab27a7ad66950d044647 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:30:29 -0400 Subject: [PATCH 11/47] add npm --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 532a2c2..18a0a62 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -14,7 +14,7 @@ jobs: - name: Environment setup run: | apt-get update - apt-get install -y python git sudo nodejs patch node + apt-get install -y python git sudo nodejs patch npm - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From 2566f68d236893a3e6768472df73717e9deba91a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:32:14 -0400 Subject: [PATCH 12/47] link nodejs and node --- .forgejo/workflows/test-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 18a0a62..201653c 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -15,6 +15,8 @@ jobs: run: | apt-get update apt-get install -y python git sudo nodejs patch npm + whereis nodejs + ln -s /usr/bin/nodejs /usr/bin/node - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From 389c9d5535b579aec128e394e6a5ac961af1bfa6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:51:08 -0400 Subject: [PATCH 13/47] install nodejs16 --- .forgejo/workflows/test-build.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 201653c..d79a6f9 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -10,13 +10,17 @@ jobs: env: pkgver: 8.1.1 buildno: 39 + build_deps: git make g++ bzip2 sudo patch python steps: - name: Environment setup run: | apt-get update - apt-get install -y python git sudo nodejs patch npm - whereis nodejs - ln -s /usr/bin/nodejs /usr/bin/node + apt-get install -y $build_deps + curl -JO https://deb.nodesource.com/gpgkey/nodesource.gpg.key + gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg nodesource.gpg.key + echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x $(lsb_release -c -s) main" > /etc/apt/sources.list.d/nodesource.list + apt-get update && apt-get install -y nodejs + npm install -g pkg grunt grunt-cli - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From 35b298d9d7b023d4269f8d197329b7e3614eee06 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:52:09 -0400 Subject: [PATCH 14/47] get curl --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index d79a6f9..1c66827 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -10,7 +10,7 @@ jobs: env: pkgver: 8.1.1 buildno: 39 - build_deps: git make g++ bzip2 sudo patch python + build_deps: git make g++ bzip2 sudo patch python curl steps: - name: Environment setup run: | From b522b5f66e47ea32c3e2208047ff2f26c1985619 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:53:40 -0400 Subject: [PATCH 15/47] get lsb-release --- .forgejo/workflows/test-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 1c66827..ec5ae29 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -10,7 +10,7 @@ jobs: env: pkgver: 8.1.1 buildno: 39 - build_deps: git make g++ bzip2 sudo patch python curl + build_deps: git make g++ bzip2 sudo patch python curl lsb-release steps: - name: Environment setup run: | @@ -19,7 +19,7 @@ jobs: curl -JO https://deb.nodesource.com/gpgkey/nodesource.gpg.key gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg nodesource.gpg.key echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x $(lsb_release -c -s) main" > /etc/apt/sources.list.d/nodesource.list - apt-get update && apt-get install -y nodejs + apt-get update && apt-get install -y nodejs npm npm install -g pkg grunt grunt-cli - name: Getting patches uses: actions/checkout@v4 From 7aff5cf496c3fe35c23d8fa6d7f661a98efc9798 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 16:54:53 -0400 Subject: [PATCH 16/47] do not && --- .forgejo/workflows/test-build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index ec5ae29..e083833 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -19,7 +19,8 @@ jobs: curl -JO https://deb.nodesource.com/gpgkey/nodesource.gpg.key gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg nodesource.gpg.key echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x $(lsb_release -c -s) main" > /etc/apt/sources.list.d/nodesource.list - apt-get update && apt-get install -y nodejs npm + apt-get update + apt-get install -y nodejs npm npm install -g pkg grunt grunt-cli - name: Getting patches uses: actions/checkout@v4 From 0d222eea9bb130d2bcca4f7588503683815e1ff4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:32:54 -0400 Subject: [PATCH 17/47] use nodesource curl --- .forgejo/workflows/test-build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index e083833..c659fc9 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -16,11 +16,9 @@ jobs: run: | apt-get update apt-get install -y $build_deps - curl -JO https://deb.nodesource.com/gpgkey/nodesource.gpg.key - gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg nodesource.gpg.key - echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x $(lsb_release -c -s) main" > /etc/apt/sources.list.d/nodesource.list + curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get update - apt-get install -y nodejs npm + apt-get install -y nodejs npm install -g pkg grunt grunt-cli - name: Getting patches uses: actions/checkout@v4 From d9b85940acc69c4cdd502878435f70953dabbc65 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:35:39 -0400 Subject: [PATCH 18/47] try direct builddeps --- .forgejo/workflows/test-build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index c659fc9..87b0025 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -10,12 +10,11 @@ jobs: env: pkgver: 8.1.1 buildno: 39 - build_deps: git make g++ bzip2 sudo patch python curl lsb-release steps: - name: Environment setup run: | apt-get update - apt-get install -y $build_deps + apt-get install -y git make g++ bzip2 sudo patch python curl lsb-release curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get update apt-get install -y nodejs From 4a0a7e0ebd2fd0e8992f2372e76e359774be0782 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:38:14 -0400 Subject: [PATCH 19/47] use older checkout --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 87b0025..a9b7afa 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -20,7 +20,7 @@ jobs: apt-get install -y nodejs npm install -g pkg grunt grunt-cli - name: Getting patches - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Cloning document server source run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server - name: Cloning build tools From f4c50c9babcf835230c85167b0fd6c771e7e0650 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:41:32 -0400 Subject: [PATCH 20/47] use onlyoffice/documentserver image --- .forgejo/workflows/test-build.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index a9b7afa..6980b5a 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,7 +6,7 @@ jobs: build-test: runs-on: x86_64 container: - image: ubuntu:16.04 + image: onlyoffice/documentserver:8.1.1.39 env: pkgver: 8.1.1 buildno: 39 @@ -19,8 +19,9 @@ jobs: apt-get update apt-get install -y nodejs npm install -g pkg grunt grunt-cli + cat /etc/os-release - name: Getting patches - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cloning document server source run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server - name: Cloning build tools From 3bb039e9c26cfb878e389377ed6cea7170fd5cef Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:43:39 -0400 Subject: [PATCH 21/47] use existing version --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 6980b5a..1e3ee53 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,7 +6,7 @@ jobs: build-test: runs-on: x86_64 container: - image: onlyoffice/documentserver:8.1.1.39 + image: onlyoffice/documentserver:8.1.1.2 env: pkgver: 8.1.1 buildno: 39 From 8089a1aa736124afbf5f357ff081d69464eb1d51 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:45:27 -0400 Subject: [PATCH 22/47] add python3 depend --- .forgejo/workflows/test-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 1e3ee53..c0a8766 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -13,13 +13,13 @@ jobs: steps: - name: Environment setup run: | + cat /etc/os-release apt-get update - apt-get install -y git make g++ bzip2 sudo patch python curl lsb-release + apt-get install -y git make g++ bzip2 sudo patch python3 python-is-python3 curl lsb-release curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get update apt-get install -y nodejs npm install -g pkg grunt grunt-cli - cat /etc/os-release - name: Getting patches uses: actions/checkout@v4 - name: Cloning document server source From d8b72c1ad7a2abed3c36a1b4ffea88d1cc34dc5f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:50:46 -0400 Subject: [PATCH 23/47] find patches --- .forgejo/workflows/test-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index c0a8766..7be85e1 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -34,8 +34,8 @@ jobs: run: git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io - name: Applying patches run: | - patch -p1 -d onlyoffice-document-server -i web-apps.patch - patch -p1 -d onlyoffice-document-server -i server.patch + patch -p1 -d onlyoffice-document-server/web-apps -i $GITHUB_WORKSPACE/web-apps.patch + patch -p1 -d onlyoffice-document-server/server -i $GITHUB_WORKSAPCE/server.patch - name: Building onlyoffice run: | cd onlyoffice-document-server/build_tools From 428720e438a16bfad2e68d7478e7238d0516caac Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 17:55:22 -0400 Subject: [PATCH 24/47] typo --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 7be85e1..15f4b86 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -35,7 +35,7 @@ jobs: - name: Applying patches run: | patch -p1 -d onlyoffice-document-server/web-apps -i $GITHUB_WORKSPACE/web-apps.patch - patch -p1 -d onlyoffice-document-server/server -i $GITHUB_WORKSAPCE/server.patch + patch -p1 -d onlyoffice-document-server/server -i $GITHUB_WORKSPACE/server.patch - name: Building onlyoffice run: | cd onlyoffice-document-server/build_tools From 2a0e13c0d364fb9a9d247d43e3408a1b5fcb5dad Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 18:02:28 -0400 Subject: [PATCH 25/47] downgrade 8.0.1.50 --- .forgejo/workflows/test-build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 15f4b86..bfe6ae3 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,10 +6,10 @@ jobs: build-test: runs-on: x86_64 container: - image: onlyoffice/documentserver:8.1.1.2 + image: onlyoffice/documentserver:8.0.1.1 env: - pkgver: 8.1.1 - buildno: 39 + pkgver: 8.0.1 + buildno: 60 steps: - name: Environment setup run: | From 081e2c2c21759f731410afa920e6169563210dc0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 18:03:54 -0400 Subject: [PATCH 26/47] downgrade node_14 --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index bfe6ae3..dded79f 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -16,7 +16,7 @@ jobs: cat /etc/os-release apt-get update apt-get install -y git make g++ bzip2 sudo patch python3 python-is-python3 curl lsb-release - curl -sL https://deb.nodesource.com/setup_16.x | bash - + curl -sL https://deb.nodesource.com/setup_14.x | bash - apt-get update apt-get install -y nodejs npm install -g pkg grunt grunt-cli From 0c52b5d88415a13b97eead1ed641a468b11ad230 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 18:19:49 -0400 Subject: [PATCH 27/47] typo --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index dded79f..d635a09 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -9,7 +9,7 @@ jobs: image: onlyoffice/documentserver:8.0.1.1 env: pkgver: 8.0.1 - buildno: 60 + buildno: 50 steps: - name: Environment setup run: | From cb7d283416fe4f7abc7dc312bef8a435e5b46000 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 18:23:57 -0400 Subject: [PATCH 28/47] Revert "downgrade node_14" This reverts commit 081e2c2c21759f731410afa920e6169563210dc0. --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index d635a09..bc1f373 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -16,7 +16,7 @@ jobs: cat /etc/os-release apt-get update apt-get install -y git make g++ bzip2 sudo patch python3 python-is-python3 curl lsb-release - curl -sL https://deb.nodesource.com/setup_14.x | bash - + curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get update apt-get install -y nodejs npm install -g pkg grunt grunt-cli From 9f397cb265402fd2bccea371ddd65741c9356cf5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 23 Aug 2024 18:40:51 -0400 Subject: [PATCH 29/47] downgrade build no 1 --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index bc1f373..cf4aafb 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -9,7 +9,7 @@ jobs: image: onlyoffice/documentserver:8.0.1.1 env: pkgver: 8.0.1 - buildno: 50 + buildno: 1 steps: - name: Environment setup run: | From 050817e10d5eca674e421d63e4598ef1d462a720 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:14:50 -0400 Subject: [PATCH 30/47] update --- .forgejo/workflows/test-build.yaml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index cf4aafb..18e10de 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,16 +6,16 @@ jobs: build-test: runs-on: x86_64 container: - image: onlyoffice/documentserver:8.0.1.1 + image: onlyoffice/documentserver:8.1.1.2 env: - pkgver: 8.0.1 - buildno: 1 + pkgver: 8.1.1 + buildno: 39 steps: - name: Environment setup run: | cat /etc/os-release apt-get update - apt-get install -y git make g++ bzip2 sudo patch python3 python-is-python3 curl lsb-release + 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 - apt-get update apt-get install -y nodejs @@ -34,13 +34,18 @@ jobs: run: git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io - name: Applying patches run: | - patch -p1 -d onlyoffice-document-server/web-apps -i $GITHUB_WORKSPACE/web-apps.patch - patch -p1 -d onlyoffice-document-server/server -i $GITHUB_WORKSPACE/server.patch + git -C onlyoffice-document-server/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch + git -C onlyoffice-document-server/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.patch - name: Building onlyoffice run: | cd onlyoffice-document-server/build_tools - ./configure.py --update 0 --module "server" - ./make.py + mkdir -p ./system_qt/gcc_64 + 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/plugins ./system_qt/gcc_64/plugins + python2 ./build_tools/tools/linux/deps.py + python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt + python2 ./make.py - name: Package upload uses: forgejo/upload-artifact@v3 with: From af061b99282a1544fa624f2b865871980dda1704 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:33:40 -0400 Subject: [PATCH 31/47] update 8.1 --- server.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server.patch b/server.patch index 5276ebc..03c4856 100644 --- a/server.patch +++ b/server.patch @@ -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 From aab614a471160f3251aaa28b652f74da7fa01570 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:33:52 -0400 Subject: [PATCH 32/47] use ubuntu:22.04 image --- .forgejo/workflows/test-build.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 18e10de..808bf3d 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -6,7 +6,7 @@ jobs: build-test: runs-on: x86_64 container: - image: onlyoffice/documentserver:8.1.1.2 + image: ubuntu:22.04 env: pkgver: 8.1.1 buildno: 39 @@ -17,7 +17,6 @@ jobs: apt-get update 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 - - apt-get update apt-get install -y nodejs npm install -g pkg grunt grunt-cli - 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/qt5/bin ./system_qt/gcc_64/bin 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 ./make.py - name: Package upload From 11e79d416019468ef9c1794db5dec66bd347d7e5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:38:08 -0400 Subject: [PATCH 33/47] Cleanup build steps --- .forgejo/workflows/test-build.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 808bf3d..b7f103c 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -19,23 +19,20 @@ jobs: curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get install -y nodejs npm install -g pkg grunt grunt-cli + - name: Cloning source + run: | + git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server + git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools + git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno onlyoffice-document-server/document-server-integration + git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno onlyoffice-document-server/document-templates + git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io - name: Getting patches uses: actions/checkout@v4 - - name: Cloning document server source - run: git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server - - name: Cloning build tools - run: git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools - - name: Cloning document server integration - run: git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno onlyoffice-document-server/document-server-integration - - name: Cloning document templates - run: git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno onlyoffice-document-server/document-templates - - name: Cloning onlyoffice io - run: git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io - name: Applying patches run: | git -C onlyoffice-document-server/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch git -C onlyoffice-document-server/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.patch - - name: Building onlyoffice + - name: Development setup run: | cd onlyoffice-document-server/build_tools mkdir -p ./system_qt/gcc_64 @@ -45,6 +42,7 @@ jobs: pushd tools/linux python2 ./deps.py popd + - name: Onlyoffice server build python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt python2 ./make.py - name: Package upload From d40449db4094c7a7e0caaa5a9c8e07fbe7519d9f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:39:07 -0400 Subject: [PATCH 34/47] dont use pushd popd --- .forgejo/workflows/test-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index b7f103c..0a02527 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -39,9 +39,9 @@ jobs: 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/plugins ./system_qt/gcc_64/plugins - pushd tools/linux + cd tools/linux python2 ./deps.py - popd + cd ../../ - name: Onlyoffice server build python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt python2 ./make.py From bad525a5206c39afb4e97137892ceb06cbfd03ee Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:40:22 -0400 Subject: [PATCH 35/47] add missing run --- .forgejo/workflows/test-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 0a02527..ff5068f 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -43,6 +43,7 @@ jobs: python2 ./deps.py cd ../../ - name: Onlyoffice server build + run: | python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt python2 ./make.py - name: Package upload From 491aecdab938adf70b21592e8e65c4f631d99885 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:45:44 -0400 Subject: [PATCH 36/47] get patches earlier --- .forgejo/workflows/test-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index ff5068f..2c036f9 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -19,6 +19,8 @@ jobs: 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 onlyoffice-document-server @@ -26,8 +28,6 @@ jobs: git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno onlyoffice-document-server/document-server-integration git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno onlyoffice-document-server/document-templates git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io - - name: Getting patches - uses: actions/checkout@v4 - name: Applying patches run: | git -C onlyoffice-document-server/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch From 7026014a0074c40e8d623816f434c8d214ab28ce Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 10:51:44 -0400 Subject: [PATCH 37/47] cd in build_tools --- .forgejo/workflows/test-build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 2c036f9..d12898b 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -34,16 +34,15 @@ jobs: git -C onlyoffice-document-server/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.patch - name: Development setup run: | - cd onlyoffice-document-server/build_tools mkdir -p ./system_qt/gcc_64 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/plugins ./system_qt/gcc_64/plugins cd tools/linux python2 ./deps.py - cd ../../ - name: Onlyoffice server build run: | + cd onlyoffice-document-server/build_tools python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt python2 ./make.py - name: Package upload From eb3f0d793f9efa5369036e4bcadf6c5eae68e993 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 11:12:29 -0400 Subject: [PATCH 38/47] put under build --- .forgejo/workflows/test-build.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index d12898b..4676e29 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -23,32 +23,32 @@ jobs: uses: actions/checkout@v4 - name: Cloning source run: | - git clone https://github.com/ONLYOFFICE/DocumentServer --recursive -b v$pkgver onlyoffice-document-server - git clone https://github.com/ONLYOFFICE/build_tools.git -b v$pkgver.$buildno onlyoffice-document-server/build_tools - git clone https://github.com/ONLYOFFICE/document-server-integration -b v$pkgver.$buildno onlyoffice-document-server/document-server-integration - git clone https://github.com/ONLYOFFICE/document-templates -b v$pkgver.$buildno onlyoffice-document-server/document-templates - git clone https://github.com/ONLYOFFICE/onlyoffice.github.io onlyoffice-document-server/onlyoffice.github.io + 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 - name: Applying patches run: | - git -C onlyoffice-document-server/server apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/server.patch - git -C onlyoffice-document-server/web-apps apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/web-apps.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 - name: Development setup run: | - mkdir -p ./system_qt/gcc_64 - 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/plugins ./system_qt/gcc_64/plugins - cd tools/linux + mkdir -p build/build_tools/system_qt/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/qt5/bin build/build_tools/system_qt/gcc_64/bin + ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins build/build_tools/system_qt/gcc_64/plugins + cd build/build_tools/tools/linux python2 ./deps.py - name: Onlyoffice server build run: | - cd onlyoffice-document-server/build_tools + cd build/build_tools python2 ./configure.py --update 0 --module "server" --qt-dir $(pwd)/system_qt python2 ./make.py - name: Package upload uses: forgejo/upload-artifact@v3 with: name: documentserver - path: ./out/linux_64/onlyoffice/documentserver/* + path: build/build_tools/out/linux_64/onlyoffice/documentserver/* From 23da6c436971eb92f8d677a0a38a48c21084576f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 14:08:20 -0400 Subject: [PATCH 39/47] add v8 patch, build deb package --- .forgejo/workflows/test-build.yaml | 25 ++++++++++++++-------- core_v8-no-enum-constexrp-conversion.patch | 14 ++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 core_v8-no-enum-constexrp-conversion.patch diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 4676e29..ce9a708 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -10,12 +10,13 @@ jobs: 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 + 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 @@ -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-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 $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/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/qt5/bin build/build_tools/system_qt/gcc_64/bin - ln -s /usr/lib/x86_64-linux-gnu/qt5/plugins build/build_tools/system_qt/gcc_64/plugins + 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: Onlyoffice server build + - name: Build server run: | 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 + - 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 - path: build/build_tools/out/linux_64/onlyoffice/documentserver/* + name: documentserver-deb + path: build/document-server-package/deb/onlyoffice-documentserver_*.deb diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch new file mode 100644 index 0000000..941995f --- /dev/null +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -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", + From 812c4710f8ff9ca9cf0611fc7c3652c5dd26eefa Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 14:13:09 -0400 Subject: [PATCH 40/47] typo --- .forgejo/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index ce9a708..c3267ed 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -29,7 +29,7 @@ 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-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 $pkgver.$buildno build/document-server-package + 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 From 31accc20efb51ef0adf3aa8f4aa0043e08c86c05 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 14:25:50 -0400 Subject: [PATCH 41/47] add release-build for deployment --- .forgejo/workflows/release-build.yaml | 81 +++++++++++++++++++++++++++ .forgejo/workflows/test-build.yaml | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 .forgejo/workflows/release-build.yaml diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml new file mode 100644 index 0000000..3b45c6b --- /dev/null +++ b/.forgejo/workflows/release-build.yaml @@ -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 + + diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index c3267ed..4e6ef09 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -3,7 +3,7 @@ on: types: [ assigned, opened, synchronize, reopened ] jobs: - build-test: + test-build: runs-on: x86_64 container: image: ubuntu:22.04 From 459ecc14869b33575e1aadca8e03d9aaf0b882f9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 14:26:37 -0400 Subject: [PATCH 42/47] fix patch --- core_v8-no-enum-constexrp-conversion.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch index 941995f..e70a055 100644 --- a/core_v8-no-enum-constexrp-conversion.patch +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -1,6 +1,6 @@ -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 +diff --git a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn 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 +--- a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn +++ 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. From 2d73ea6e06b1213acc7f19a7f6300a1c5aaa81ac Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 15:41:37 -0400 Subject: [PATCH 43/47] fix core patch --- core_v8-no-enum-constexrp-conversion.patch | 44 ++++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch index e70a055..931fce2 100644 --- a/core_v8-no-enum-constexrp-conversion.patch +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -1,14 +1,34 @@ -diff --git a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn 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 -+++ 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", +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/core/scripts/core_common/modules/v8_89.py b/core/scripts/core_common/modules/v8_89.py +index 9643263..35ee1fe 100644 +--- a/core/scripts/core_common/modules/v8_89.py ++++ b/core/scripts/core_common/modules/v8_89.py +@@ -150,6 +150,8 @@ def make(): + "use_custom_libcxx=false", + "treat_warnings_as_errors=false"] -+ "-Wno-enum-constexpr-conversion", ++ base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"]) + -+ - # TODO(https://crbug.com/999886): Clean up, enable. - "-Wno-final-dtor-non-final-class", - + 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"]) + From b23b60062c503a6791d57037f2d45b4e32526622 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 15:49:11 -0400 Subject: [PATCH 44/47] fix patch --- core_v8-no-enum-constexrp-conversion.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch index 931fce2..da56ce3 100644 --- a/core_v8-no-enum-constexrp-conversion.patch +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -11,17 +11,17 @@ index 0000000000..5a1a8067a6 +@@ -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/core/scripts/core_common/modules/v8_89.py b/core/scripts/core_common/modules/v8_89.py ++ +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/core/scripts/core_common/modules/v8_89.py -+++ b/core/scripts/core_common/modules/v8_89.py +--- 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"] From 21715b384717c7f859c6efb410e3e4a33958bee1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 17:25:03 -0400 Subject: [PATCH 45/47] forgejo-ci: initial port --- .forgejo/workflows/release-build.yaml | 81 +++++++++++++++++++++++++++ .forgejo/workflows/test-build.yaml | 55 +++++++++++++++++- 2 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 .forgejo/workflows/release-build.yaml diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml new file mode 100644 index 0000000..471ef80 --- /dev/null +++ b/.forgejo/workflows/release-build.yaml @@ -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: Fetching sources + 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 + + diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 008e492..c315e34 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -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: Fetching sources + 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 + + From 26497e918b0f1f9735f8446e5f272bd078710e59 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 17:25:36 -0400 Subject: [PATCH 46/47] server.patch: fix for 8.1 --- server.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server.patch b/server.patch index 5276ebc..03c4856 100644 --- a/server.patch +++ b/server.patch @@ -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 From 748136ba54e59f44578868714981fc90bb92d7f6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 17:26:05 -0400 Subject: [PATCH 47/47] core_v8-no-enum-constexrp-conversion: fixes v8 build on ubuntu 22.04 --- core_v8-no-enum-constexrp-conversion.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 core_v8-no-enum-constexrp-conversion.patch diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch new file mode 100644 index 0000000..da56ce3 --- /dev/null +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -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"]) +