From 9b4ef3ed01eb87a1a83bbe2cea79f074705e5421 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Feb 2025 15:57:05 -0500 Subject: [PATCH] Upgrade to 8.3.0-98 --- .forgejo/workflows/release-build.yaml | 5 +++-- disable-licensing-limits.patch | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index 6f59067..9e64a9d 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -9,8 +9,8 @@ jobs: container: image: ubuntu:22.04 env: - pkgver: 8.2.2 - buildno: 22 + pkgver: 8.3.0 + buildno: 98 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 diff --git a/disable-licensing-limits.patch b/disable-licensing-limits.patch index 3f82618..14b7581 100644 --- a/disable-licensing-limits.patch +++ b/disable-licensing-limits.patch @@ -118,11 +118,11 @@ index 2209e8c9..feef6247 100644 setInterval(updateLicense, 86400000); } else { const converter = require('./converter'); -diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js -index 8813cbac..90177d15 100644 ---- a/server/Common/sources/license.js +diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js +index d43ee210..9e787b08 100644 +--- a/server/Common/sources/license.js.orig +++ 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]; };