Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch release/v6.2.0 into master #266

Merged
merged 69 commits into from
Mar 1, 2021
Merged

Merge branch release/v6.2.0 into master #266

merged 69 commits into from
Mar 1, 2021

Conversation

papacarlo
Copy link
Contributor

trofim24 and others added 30 commits October 26, 2020 20:30
@trofim24
[run] Add logs
798c1d4
@KhromovNikita
Added Git check (#179)
de24cdf 
* Added Git check
@KhromovNikita
Feature/check redis (#178)
8f3fcdf 
* Check Redis
@KhromovNikita
Fix (#181)
0f065be 
* Fix
@trofim24
[run] Fix check Redis
87f67c2
@trofim24
[run] Add Redis
3461f8c 
Add check Redis
@trofim24
[build] Add beta
479db29 
Add beta option for build
@trofim24
[run] Fix
d5813b4
@KhromovNikita
Fix Node.js link (#189)
c1a54ff
@trofim24
[run] Fix linux|mac os
88ade05
@K0R0L
Merge remote-tracking branch 'origin/release/v6.1.0' into develop
3686e77
@K0R0L
Merge pull request #197 from ONLYOFFICE/release/v6.1.0
275c1cf 
Release/v6.1.0
@K0R0L
Merge pull request #200 from ONLYOFFICE/release/v6.1.0
62dc583 
Release/v6.1.0
@trofim24
[run] Fix
25dc0d8 
Move check in make
@KhromovNikita
Updated Redis version (#185)
4cc0bd8
@trofim24
[run] Rename
09806db
@trofim24
[run] Rename
f8ce636
@trofim24
[run] Add run
410516b
@trofim24
[run] Branch from build_tools
fd74685
@KhromovNikita
SQL configure (#204)
fb6e5ef
@KhromovNikita
Added support for external folders (#205)
c3eb2e6 
* Added support for external folders
@trofim24
[run] Delete
a18547c 
Delete unused
@KhromovNikita
Added checks for Linux (#203)
276b2f9 
* Added checks for Linux
@K0R0L
Merge pull request #215 from ONLYOFFICE/release/v6.1.0
0861578 
Release/v6.1.0
@KhromovNikita
PostgreSQL check (#206)
e9954f3 
* PostgreSQL check
@KhromovNikita
Fix (#208)
88e6397
@KhromovNikita
New version of Node.js (#213)
78ad21d 
Fixes
@trofim24
[run] Delete unused
b77f139
@trofim24
[run] Delete unused
20907e7
@trofim24
[run] Fix npm path
e69b69a
trofim24 and others added 28 commits December 3, 2020 16:18
@trofim24
[run] Fix
a9aead5
@trofim24
[release] Add
27e7cc2 
Add release script
@trofim24
[add] All
ce748fa
@trofim24
[get] Fix
fc2db8d
@trofim24
[add]
e116b9d
@trofim24
[add]
344bf51
@romandemidov
Fix example build repeated patch error (#227)
e7d609f 
* Fix example build repeated patch error

* Add changes
@trofim24
Merge pull request #228 from ONLYOFFICE/release/v6.1.0
7e59c56 
[ios] Removed limitation in version numbering. https://developer.appl…
@romandemidov
Fix example build for updated modules for windows (#233)
251a592 
* Fix example build for updated modules for windows

* Check patch dir

* Make git_dir as base function

* Small changes
@K0R0L
Merge pull request #235 from ONLYOFFICE/hotfix/v6.1.1
119dc6a 
Hotfix/v6.1.1
@K0R0L
Merge pull request #240 from ONLYOFFICE/hotfix/v6.1.1
e37c9bc 
Hotfix/v6.1.1
@trofim24
[spellchecker] Fix (#246)
ba83513
@trofim24
[release] Fix (#254)
4c3d162 
Fix pull request message
@papacarlo
Merge branch hotfix/v6.1.1 into release/v6.2.0
6e68833
@K0R0L
Fix clean error (clean CURRENT build setup, not previous)
aca5560
@K0R0L
Merge pull request #256 from ONLYOFFICE/fix/cleanBug
6c05fd2 
Fix clean error (clean CURRENT build setup, not previous)
@K0R0L
Merge pull request #257 from ONLYOFFICE/fix/makeBugs
9c956d4 
.
@K0R0L
.
89061f9
@K0R0L
Fix work with temp directories
e16341b
@K0R0L
Merge pull request #258 from ONLYOFFICE/fix/makeBugs
efdd77b 
Fix work with temp directories
@K0R0L
Logging makefiles name
c07fad0
@K0R0L
Merge pull request #259 from ONLYOFFICE/fix/makeBugs
5639a0d 
Logging makefiles name
@K0R0L
Recreate make file after distclean
c3622cf
@K0R0L
Merge pull request #260 from ONLYOFFICE/fix/makeBugs
4f61bed 
Recreate make file after distclean
@ShockwaveNN
Add issue template (#262)
9ff45e3 
* Add issue template

* Fix more

* Add article
@K0R0L
Add sendto plugin to macos version
5389dff
@K0R0L
Merge pull request #263 from ONLYOFFICE/fix/k620
8e1ccbf 
Add sendto plugin to macos version
@ShockwaveNN
Force usage of npm v6 (#264)
7e20b9e 
Upgrading npm to v7 cause `npm install` error in `server` repo
on Spellchecker compilation
We didn't found exact reason why this happens and
if this a bug in npm or just some major changes in npm from v6
to v7

This error can be repoduced with this simple Dockerfile
```
FROM node:10

RUN npm install -g npm
RUN npm -v
RUN git clone --depth 1 https://github.com/ONLYOFFICE/server.git
RUN cd server/SpellChecker && \
    npm install
```
In this Dockerfile - npm v7.5.4 installed and causing:
```
Step 5/5 : RUN cd server/SpellChecker &&     npm install
 ---> Running in 158d202d2c11
npm notice
npm notice New patch version of npm available! 7.5.4 -> 7.5.6
npm notice Changelog: <https://github.com/npm/cli/releases/tag/v7.5.6>
npm notice Run `npm install -g [email protected]` to update!
npm notice
npm ERR! code 1
npm ERR! path /server/SpellChecker/node_modules/nodehun
npm ERR! command failed
npm ERR! command sh -c node-gyp rebuild
npm ERR! make: Entering directory '/server/SpellChecker/node_modules/nodehun/build'
npm ERR! make: Leaving directory '/server/SpellChecker/node_modules/nodehun/build'
npm ERR! gyp info it worked if it ends with ok
npm ERR! gyp info using [email protected]
npm ERR! gyp info using [email protected] | linux | x64
npm ERR! gyp info find Python using Python version 3.5.3 found at "/usr/bin/python3"
npm ERR! gyp http GET https://nodejs.org/download/release/v10.23.3/node-v10.23.3-headers.tar.gz
npm ERR! gyp http 200 https://nodejs.org/download/release/v10.23.3/node-v10.23.3-headers.tar.gz
npm ERR! gyp http GET https://nodejs.org/download/release/v10.23.3/SHASUMS256.txt
npm ERR! gyp http 200 https://nodejs.org/download/release/v10.23.3/SHASUMS256.txt
npm ERR! gyp info spawn /usr/bin/python3
npm ERR! gyp info spawn args [ '/usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py',
npm ERR! gyp info spawn args   'binding.gyp',
npm ERR! gyp info spawn args   '-f',
npm ERR! gyp info spawn args   'make',
npm ERR! gyp info spawn args   '-I',
npm ERR! gyp info spawn args   '/server/SpellChecker/node_modules/nodehun/build/config.gypi',
npm ERR! gyp info spawn args   '-I',
npm ERR! gyp info spawn args   '/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi',
npm ERR! gyp info spawn args   '-I',
npm ERR! gyp info spawn args   '/root/.cache/node-gyp/10.23.3/include/node/common.gypi',
npm ERR! gyp info spawn args   '-Dlibrary=shared_library',
npm ERR! gyp info spawn args   '-Dvisibility=default',
npm ERR! gyp info spawn args   '-Dnode_root_dir=/root/.cache/node-gyp/10.23.3',
npm ERR! gyp info spawn args   '-Dnode_gyp_dir=/usr/local/lib/node_modules/npm/node_modules/node-gyp',
npm ERR! gyp info spawn args   '-Dnode_lib_file=/root/.cache/node-gyp/10.23.3/<(target_arch)/node.lib',
npm ERR! gyp info spawn args   '-Dmodule_root_dir=/server/SpellChecker/node_modules/nodehun',
npm ERR! gyp info spawn args   '-Dnode_engine=v8',
npm ERR! gyp info spawn args   '--depth=.',
npm ERR! gyp info spawn args   '--no-parallel',
npm ERR! gyp info spawn args   '--generator-output',
npm ERR! gyp info spawn args   'build',
npm ERR! gyp info spawn args   '-Goutput_dir=.' ]
npm ERR! gyp info spawn make
npm ERR! gyp info spawn args [ 'BUILDTYPE=Release', '-C', 'build' ]
npm ERR! make: *** No rule to make target 'Release/obj.target/hunspell/src/hunspell/src/hunspell/affentry.o', needed by 'Release/obj.target/src/hunspell.a'.  Stop.
npm ERR! gyp ERR! build error
npm ERR! gyp ERR! stack Error: `make` failed with exit code: 2
npm ERR! gyp ERR! stack     at ChildProcess.onExit (/usr/local/lib/node_modules/npm/node_modules/node-gyp/lib/build.js:194:23)
npm ERR! gyp ERR! stack     at ChildProcess.emit (events.js:198:13)
npm ERR! gyp ERR! stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:248:12)
npm ERR! gyp ERR! System Linux 5.4.0-65-generic
npm ERR! gyp ERR! command "/usr/local/bin/node" "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "rebuild"
npm ERR! gyp ERR! cwd /server/SpellChecker/node_modules/nodehun
npm ERR! gyp ERR! node -v v10.23.3
npm ERR! gyp ERR! node-gyp -v v7.1.2
npm ERR! gyp ERR! not ok

npm ERR! A complete log of this run can be found in:
npm ERR!     /root/.npm/_logs/2021-02-23T13_33_15_384Z-debug.log
```

But if we force npm v6:
```
FROM node:10

RUN npm install -g npm@6
RUN npm -v
RUN git clone --depth 1 https://github.com/ONLYOFFICE/server.git
RUN cd server/SpellChecker && \
    npm install
```

Forcing install of npm v6.14.11 and server Spellchecker
compilation is fine
@papacarlo papacarlo merged commit 66aa92e into master Mar 1, 2021
@heatray heatray deleted the release/v6.2.0 branch May 7, 2021 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@papacarlo @trofim24 @KhromovNikita @K0R0L @romandemidov @ShockwaveNN