Skip to content

Commit

Permalink
Merge branch 'develop' into fix/bug_58072
Browse files Browse the repository at this point in the history
# Conflicts:
#	cell/view/WorksheetView.js
  • Loading branch information
GoshaZotov committed Oct 12, 2023
2 parents 6c911c7 + 3093b75 commit 97b963d
Show file tree
Hide file tree
Showing 625 changed files with 94,517 additions and 35,126 deletions.
83 changes: 83 additions & 0 deletions .github/workflows/common_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: common_check
on:
push:
branches-ignore:
- develop
pull_request:
branches-ignore:
- develop
jobs:
code-style:
runs-on: ubuntu-latest
steps:
- name: check out repository
uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: execute check styles
run: python tests/code-style/check.py
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: 14
- name: Run unit tests
run: |
npm install -g grunt-cli node-qunit-puppeteer
npm install --prefix build
grunt --gruntfile build/Gruntfile.js develop
node-qunit-puppeteer tests/common/api/api.html
node-qunit-puppeteer tests/cell/shortcuts/shortcuts.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/PivotTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/CopyPasteTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/SheetStructureTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/autoFilterTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/UserProtectedRangesTest.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTrace.html
node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
node-qunit-puppeteer tests/word/document-calculation/paragraph.html
node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
node-qunit-puppeteer tests/word/document-calculation/table/flowTablePosition.html
node-qunit-puppeteer tests/word/document-calculation/table/pageBreak.html
node-qunit-puppeteer tests/word/document-calculation/textShaper/textShaper.html
node-qunit-puppeteer tests/word/document-calculation/text-hyphenator/text-hyphenator.html
node-qunit-puppeteer tests/word/forms/forms.html
node-qunit-puppeteer tests/word/forms/complexForm.html
node-qunit-puppeteer tests/word/numbering/numberingApplicator.html
node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
node-qunit-puppeteer tests/word/api/api.html
node-qunit-puppeteer tests/word/api/textInput.html
node-qunit-puppeteer tests/word/styles/displayStyle.html
node-qunit-puppeteer tests/word/styles/paraPr.html
node-qunit-puppeteer tests/word/styles/styleApplicator.html
node-qunit-puppeteer tests/word/plugins/pluginsApi.html
node-qunit-puppeteer tests/word/merge-documents/mergeDocuments.html
node-qunit-puppeteer tests/word/shortcuts/shortcuts.html
node-qunit-puppeteer tests/slide/shortcuts/shortcuts.html
builder-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 12
uses: actions/setup-node@v1
with:
node-version: 12
- name: Run builder tests
run: |
npm install -g grunt-cli
npm install --prefix build
grunt --level=WHITESPACE_ONLY --base build --gruntfile build/Gruntfile.js
docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
-v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
-v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
-v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
onlyoffice/doc-builder-testing:next-release rake rspec_critical
40 changes: 29 additions & 11 deletions .github/workflows/check.yml → .github/workflows/dev_check.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
name: check
on: [push]
name: dev_check
on:
push:
branches:
- develop
pull_request:
branches:
- develop
jobs:
code-style:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Ruby 2.7
uses: ruby/setup-ruby@v1
- name: check out repository
uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v4
with:
ruby-version: 2.7
- name: Run rake task
run: rake check_source_files
python-version: '3.9'
- name: execute check styles
run: python tests/code-style/check.py
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
Expand All @@ -29,26 +36,37 @@ jobs:
node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/PivotTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/CopyPasteTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/SheetStructureTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/autoFilterTests.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/UserProtectedRangesTest.html
node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTrace.html
node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
node-qunit-puppeteer tests/word/document-calculation/paragraph.html
node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
node-qunit-puppeteer tests/word/document-calculation/table/flowTablePosition.html
node-qunit-puppeteer tests/word/document-calculation/table/pageBreak.html
node-qunit-puppeteer tests/word/document-calculation/textShaper/textShaper.html
node-qunit-puppeteer tests/word/document-calculation/text-hyphenator/text-hyphenator.html
node-qunit-puppeteer tests/word/forms/forms.html
node-qunit-puppeteer tests/word/forms/complexForm.html
node-qunit-puppeteer tests/word/numbering/numberingApplicator.html
node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
node-qunit-puppeteer tests/word/api/api.html
node-qunit-puppeteer tests/word/api/textInput.html
node-qunit-puppeteer tests/word/styles/displayStyle.html
node-qunit-puppeteer tests/word/styles/paraPr.html
node-qunit-puppeteer tests/word/styles/styleApplicator.html
node-qunit-puppeteer tests/word/plugins/pluginsApi.html
node-qunit-puppeteer tests/word/merge-documents/mergeDocuments.html
node-qunit-puppeteer tests/word/shortcuts/shortcuts.html
node-qunit-puppeteer tests/slide/shortcuts/shortcuts.html
builder-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 12
uses: actions/setup-node@v1
with:
Expand All @@ -62,4 +80,4 @@ jobs:
-v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
-v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
-v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
onlyofficeqa/doc-builder-testing:next-release rake rspec_critical
onlyoffice/doc-builder-testing:develop-latest rake rspec_critical
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.idea/
build/node_modules
build/deserializer/cache
build/$weak$.js
build/maps
common/AllFonts.js
Expand Down
71 changes: 0 additions & 71 deletions Rakefile

This file was deleted.

3 changes: 2 additions & 1 deletion build/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ module.exports = function(grunt) {
cwd: '../common/',
src: [
'Charts/ChartStyles.js',
'SmartArts/SmartArts.bin',
'SmartArts/SmartArtData/*',
'SmartArts/SmartArtDrawing/*',
'Images/*',
'Images/placeholders/*',
'Images/content_controls/*',
Expand Down
2 changes: 1 addition & 1 deletion build/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ This document describes the steps needed to build SDK.

2. SDK build:
- npm install -g grunt-cli
- npm install
- npm ci
- grunt
2 changes: 1 addition & 1 deletion build/build-desktop.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CD /D %~dp0
call npm install -g grunt-cli
call npm install
call npm ci
call grunt --level=WHITESPACE_ONLY --desktop=true --formatting=PRETTY_PRINT
rem call grunt --level=ADVANCED --desktop=true

Expand Down
5 changes: 3 additions & 2 deletions build/build-develop.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
CD /D %~dp0
call npm install -g grunt-cli
call npm install
call npm ci

REM call grunt --level=ADVANCED --addon=sdkjs-forms --addon=sdkjs-ooxml --desktop=true
REM call grunt --level=ADVANCED --addon=sdkjs-forms --addon=sdkjs-ooxml
REM call grunt --level=ADVANCED --addon=sdkjs-forms
call grunt --level=ADVANCED --addon=sdkjs-forms --addon=sdkjs-ooxml --desktop=true
call grunt --level=WHITESPACE_ONLY
call grunt develop

pause
2 changes: 1 addition & 1 deletion build/build.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CD /D %~dp0
call npm install -g grunt-cli
call npm install
call npm ci
rem call grunt --level=WHITESPACE_ONLY --desktop=false --formatting=PRETTY_PRINT
call grunt --level=ADVANCED

Expand Down
52 changes: 52 additions & 0 deletions build/deserializer/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Deserializer

## Overview

**deserializer** allow you to automatically get deserialized stacktrace in errors

## How to use

* Put files with errors in json format in any `logs-dir`

* Make `unique-file` with unique errors that `last-log-file` adds(`last-log-file` is optional)

```bash
node parse-json-log-dir.js logs-dir last-log-file unique-file
```
* Install dependencies for `download-maps.js`

```bash
npm ci
```

* Download Closure Compiler maps into `maps-dir` for version specified in `unique-file`

```bash
node download-maps.js accessKeyId, secretAccessKey unique-file maps-dir
```
* Download Closure Compiler maps into `maps-dir` for version specified in `unique-file`

```bash
node download-maps.js accessKeyId, secretAccessKey unique-file maps-dir
```

maps-dir structure will be

```
maps-dir/
7.4.1-36
word.props.js.map
cell.props.js.map
slide.props.js.map
<version>-<build>
<maps>
```

* Deserialize `unique-file` call stack into `deserialized-file` (docx or txt by extension)

```bash
node deserialize.js unique-file deserialized-file maps-dir
```

* The result will be in the `deserialized-file`

Binary file added build/deserializer/deserialize-template.docx
Binary file not shown.
Loading

0 comments on commit 97b963d

Please sign in to comment.