From b8ea58e005caa339e7a5ed7d77dd7cbb991481fd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 21:57:35 -0400 Subject: [PATCH] forgejo-ci: fix patching --- .forgejo/workflows/release-build.yaml | 3 +-- .forgejo/workflows/test-build.yaml | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index e3c11f2..597a315 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -33,9 +33,8 @@ jobs: 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 + git -C build apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch - name: Development setup run: | mkdir -p build/build_tools/system_qt-$qtver/gcc_64 diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index c315e34..fb782b8 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -32,9 +32,9 @@ jobs: 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 + cd build + git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch + git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch - name: Development setup run: | mkdir -p build/build_tools/system_qt-$qtver/gcc_64