Skip to content

Commit 75faf39

Browse files
committed
Merge branch 'release/v9.1.0' into feature/custom-sysroot
2 parents 584513f + 41a4e81 commit 75faf39

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2213
-1597
lines changed
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Git Operations
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
operation:
7+
description: 'Operation to perform'
8+
required: true
9+
type: choice
10+
options:
11+
- create
12+
- remove
13+
default: 'create'
14+
15+
branch_name:
16+
description: 'Branch name to create or remove'
17+
required: true
18+
type: string
19+
20+
base_branch:
21+
description: 'Base branch to work from (for create operation)'
22+
required: false
23+
type: string
24+
default: 'develop'
25+
26+
branding:
27+
description: 'Branding name'
28+
required: false
29+
type: string
30+
default: 'onlyoffice'
31+
32+
branding_url:
33+
description: 'Branding repository URL (relative to git host)'
34+
required: false
35+
type: string
36+
default: 'ONLYOFFICE/onlyoffice.git'
37+
38+
jobs:
39+
git-operations:
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- name: Checkout repository
44+
uses: actions/checkout@v4
45+
with:
46+
path: ONLYOFFICE/build_tools
47+
token: ${{ secrets.GITHUB_TOKEN }}
48+
fetch-depth: 0
49+
50+
- name: Set up Python
51+
uses: actions/setup-python@v4
52+
with:
53+
python-version: '3.x'
54+
55+
- name: Install dependencies
56+
run: |
57+
python -m pip install --upgrade pip
58+
# Install any Python dependencies if requirements.txt exists
59+
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
60+
61+
- name: Configure Git
62+
run: |
63+
git config --global user.name "GitHub Actions Bot"
64+
git config --global user.email "[email protected]"
65+
66+
- name: Run Git Operations
67+
run: |
68+
cd ONLYOFFICE/build_tools/scripts/develop
69+
python git_operations.py ${{ inputs.operation }} "${{ inputs.branch_name }}" \
70+
--base-branch="${{ inputs.base_branch }}" \
71+
--branding="${{ inputs.branding }}" \
72+
--branding-url="${{ inputs.branding_url }}" \
73+
--modules="${{ inputs.modules }}"
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
77+
- name: Operation Summary
78+
run: |
79+
echo "## Git Operations Summary" >> $GITHUB_STEP_SUMMARY
80+
echo "- **Operation**: ${{ inputs.operation }}" >> $GITHUB_STEP_SUMMARY
81+
echo "- **Branch Name**: ${{ inputs.branch_name }}" >> $GITHUB_STEP_SUMMARY
82+
echo "- **Base Branch**: ${{ inputs.base_branch }}" >> $GITHUB_STEP_SUMMARY
83+
echo "- **Branding**: ${{ inputs.branding }}" >> $GITHUB_STEP_SUMMARY
84+
echo "- **Branding URL**: ${{ inputs.branding_url }}" >> $GITHUB_STEP_SUMMARY
85+
echo "- **Modules**: ${{ inputs.modules }}" >> $GITHUB_STEP_SUMMARY
86+
if [ "${{ inputs.operation }}" = "remove" ] && [ "${{ inputs.force_remove }}" = "true" ]; then
87+
echo "- **Force Remove**: Yes" >> $GITHUB_STEP_SUMMARY
88+
fi

Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ ENV TZ=Etc/UTC
44
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
55

66
RUN apt-get -y update && \
7-
apt-get -y install python \
8-
python3 \
7+
apt-get -y install tar \
98
sudo
10-
RUN rm /usr/bin/python && ln -s /usr/bin/python2 /usr/bin/python
9+
1110
ADD . /build_tools
1211
WORKDIR /build_tools
1312

13+
RUN mkdir -p /opt/python3 && \
14+
tar -xzf /build_tools/tools/linux/python3.tar.gz -C /opt/python3 --strip-components=1
15+
16+
ENV PATH="/opt/python3/bin:${PATH}"
17+
18+
RUN ln -s /opt/python3/bin/python3.10 /usr/bin/python
19+
1420
CMD ["sh", "-c", "cd tools/linux && python3 ./automate.py"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ necessary for the compilation process, all the dependencies required for the
88
correct work, as well as to get the latest version of
99
**ONLYOFFICE products** source code and build all their components.
1010

11-
**Important!** We can only guarantee the correct work of the products built from
12-
the `master` branch.
11+
**Important!** We can only guarantee the correct work of the products built
12+
from the `master` branch.
1313

1414
## How to use - Linux
1515

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
parser.add_option("--module", action="store", type="string", dest="module", default="builder", help="defines what modules to build. You can specify several of them, e.g. --module 'core desktop builder server mobile'")
1515
parser.add_option("--develop", action="store", type="string", dest="develop", default="0", help="defines develop mode")
1616
parser.add_option("--beta", action="store", type="string", dest="beta", default="0", help="defines beta mode")
17-
parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]")
17+
parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'win_arm64', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]")
1818
parser.add_option("--config", action="store", type="string", dest="config", default="", help="provides ability to specify additional parameters for qmake")
1919
parser.add_option("--qt-dir", action="store", type="string", dest="qt-dir", default="", help="defines qmake directory path. qmake can be found in qt-dir/compiler/bin directory")
2020
parser.add_option("--qt-dir-xp", action="store", type="string", dest="qt-dir-xp", default="", help="defines qmake directory path for Windows XP. qmake can be found in 'qt-dir/compiler/bin directory")

defaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sdkjs-plugin="photoeditor, macros, ocr, translator, thesaurus, youtube, highlightcode, zotero"
2-
sdkjs-plugin-server="speech, zotero, mendeley, speechrecognition, drawio"
1+
sdkjs-plugin="ai, photoeditor, ocr, translator, thesaurus, youtube, highlightcode"
2+
sdkjs-plugin-server="speech, zotero, mendeley, speechrecognition"
33
sdkjs-addons="sdkjs-forms"

develop/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ but don't want to compile pretty compilcated core product to make those changes.
66

77
## System requirements
88

9+
**Note**: ARM-based architectures are currently **NOT** supported;
10+
attempting to run the images on ARM devices may result in startup failures
11+
or other runtime issues.
12+
913
### Windows
1014

1115
You need the latest

0 commit comments

Comments
 (0)