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.

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

[stable21] Show most recently deleted files first in trash can #29629

Merged
merged 3 commits into from
Nov 23, 2021

Conversation

szaimen
Copy link
Contributor

@szaimen szaimen commented Nov 10, 2021

Manual backport of #29611

@szaimen szaimen added this to the Nextcloud 21.0.6 milestone Nov 10, 2021
@szaimen szaimen changed the base branch from master to stable21 November 10, 2021 14:12
@szaimen
Copy link
Contributor Author

szaimen commented Nov 10, 2021

/compile /

@szaimen szaimen mentioned this pull request Nov 10, 2021
@szaimen
Copy link
Contributor Author

szaimen commented Nov 10, 2021

/compile /

@szaimen szaimen changed the title [stable21] backport of 29611 [stable21] backport of Show most recently deleted files first in trash can Nov 10, 2021
@szaimen szaimen changed the title [stable21] backport of Show most recently deleted files first in trash can [stable21] Show most recently deleted files first in trash can Nov 10, 2021
@szaimen
Copy link
Contributor Author

szaimen commented Nov 10, 2021

@skjnldsv seems like the compile command fails but I am not sure why.
Do the logs make sense to you?

click to expand
In file included from /home/runner/.cache/node-gyp/16.13.0/include/node/v8.h:30,
                 from /home/runner/.cache/node-gyp/16.13.0/include/node/node.h:63,
                 from ../../nan/nan.h:56,
                 from ../src/binding.cpp:1:
/home/runner/.cache/node-gyp/16.13.0/include/node/v8-internal.h: In function ‘void v8::internal::PerformCastCheck(T*)’:
/home/runner/.cache/node-gyp/16.13.0/include/node/v8-internal.h:492:38: error: ‘remove_cv_t’ is not a member of ‘std’; did you mean ‘remove_cv’?
  492 |             !std::is_same<Data, std::remove_cv_t<T>>::value>::Perform(data);
      |                                      ^~~~~~~~~~~
      |                                      remove_cv
/home/runner/.cache/node-gyp/16.13.0/include/node/v8-internal.h:492:38: error: ‘remove_cv_t’ is not a member of ‘std’; did you mean ‘remove_cv’?
  492 |             !std::is_same<Data, std::remove_cv_t<T>>::value>::Perform(data);
      |                                      ^~~~~~~~~~~
      |                                      remove_cv
/home/runner/.cache/node-gyp/16.13.0/include/node/v8-internal.h:492:50: error: template argument 2 is invalid
  492 |             !std::is_same<Data, std::remove_cv_t<T>>::value>::Perform(data);
      |                                                  ^
/home/runner/.cache/node-gyp/16.13.0/include/node/v8-internal.h:492:63: error: ‘::Perform’ has not been declared
  492 |             !std::is_same<Data, std::remove_cv_t<T>>::value>::Perform(data);
      |                                                               ^~~~~~~
In file included from ../src/binding.cpp:1:
../../nan/nan.h: In function ‘void Nan::AsyncQueueWorker(Nan::AsyncWorker*)’:
../../nan/nan.h:2294:62: warning: cast between incompatible function types from ‘void (*)(uv_work_t*)’ {aka ‘void (*)(uv_work_s*)’} to ‘uv_after_work_cb’ {aka ‘void (*)(uv_work_s*, int)’} [-Wcast-function-type]
 2294 |     , reinterpret_cast<uv_after_work_cb>(AsyncExecuteComplete)
      |                                                              ^
../src/binding.cpp: In function ‘Nan::NAN_METHOD_RETURN_TYPE render(Nan::NAN_METHOD_ARGS_TYPE)’:
../src/binding.cpp:284:98: warning: cast between incompatible function types from ‘void (*)(uv_work_t*)’ {aka ‘void (*)(uv_work_s*)’} to ‘uv_after_work_cb’ {aka ‘void (*)(uv_work_s*, int)’} [-Wcast-function-type]
  284 |     int status = uv_queue_work(uv_default_loop(), &ctx_w->request, compile_it, (uv_after_work_cb)MakeCallback);
      |                                                                                                  ^~~~~~~~~~~~
../src/binding.cpp: In function ‘Nan::NAN_METHOD_RETURN_TYPE render_file(Nan::NAN_METHOD_ARGS_TYPE)’:
../src/binding.cpp:320:98: warning: cast between incompatible function types from ‘void (*)(uv_work_t*)’ {aka ‘void (*)(uv_work_s*)’} to ‘uv_after_work_cb’ {aka ‘void (*)(uv_work_s*, int)’} [-Wcast-function-type]
  320 |     int status = uv_queue_work(uv_default_loop(), &ctx_w->request, compile_it, (uv_after_work_cb)MakeCallback);
      |                                                                                                  ^~~~~~~~~~~~
In file included from ../../nan/nan.h:56,
                 from ../src/binding.cpp:1:
../src/binding.cpp: At global scope:
/home/runner/.cache/node-gyp/16.13.0/include/node/node.h:821:43: warning: cast between incompatible function types from ‘void (*)(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE)’ {aka ‘void (*)(v8::Local<v8::Object>)’} to ‘node::addon_register_func’ {aka ‘void (*)(v8::Local<v8::Object>, v8::Local<v8::Value>, void*)’} [-Wcast-function-type]
  821 |       (node::addon_register_func) (regfunc),                          \
      |                                           ^
/home/runner/.cache/node-gyp/16.13.0/include/node/node.h:855:3: note: in expansion of macro ‘NODE_MODULE_X’
  855 |   NODE_MODULE_X(modname, regfunc, NULL, 0)  // NOLINT (readability/null_usage)
      |   ^~~~~~~~~~~~~
../src/binding.cpp:358:1: note: in expansion of macro ‘NODE_MODULE’
  358 | NODE_MODULE(binding, RegisterModule);
      | ^~~~~~~~~~~
make: *** [binding.target.mk:133: Release/obj.target/binding/src/binding.o] Error 1
make: Leaving directory '/home/runner/work/server/server/node_modules/node-sass/build'
gyp ERR! build error 
gyp ERR! stack Error: `make` failed with exit code: 2
gyp ERR! stack     at ChildProcess.onExit (/home/runner/work/server/server/node_modules/node-gyp/lib/build.js:194:23)
gyp ERR! stack     at ChildProcess.emit (node:events:390:28)
gyp ERR! stack     at Process.ChildProcess._handle.onexit (node:internal/child_process:290:12)
gyp ERR! System Linux 5.11.0-1020-azure
gyp ERR! command "/opt/hostedtoolcache/node/16.13.0/x64/bin/node" "/home/runner/work/server/server/node_modules/node-gyp/bin/node-gyp.js" "rebuild" "--verbose" "--libsass_ext=" "--libsass_cflags=" "--libsass_ldflags=" "--libsass_library="
gyp ERR! cwd /home/runner/work/server/server/node_modules/node-sass
gyp ERR! node -v v16.13.0
gyp ERR! node-gyp -v v7.1.2
gyp ERR! not ok 
Build failed with error code: 1
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! node-sass@5.0.0 postinstall: `node scripts/build.js`
npm ERR! Exit status 1
npm ERR! 
npm ERR! Failed at the node-sass@5.0.0 postinstall script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     /home/runner/.npm/_logs/2021-11-10T14_33_24_311Z-debug.log
Error: Process completed with exit code 1.

@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2021

/rebase

Signed-off-by: Orzu Ionut <orzu.ionut@gmail.com>
Signed-off-by: Orzu Ionut <orzu.ionut@gmail.com>
@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2021

/compile amend /

1 similar comment
@szaimen
Copy link
Contributor Author

szaimen commented Nov 17, 2021

/compile amend /

@szaimen
Copy link
Contributor Author

szaimen commented Nov 17, 2021

@skjnldsv do we need to update the node verison in package.json on this branch to be able to run the compile command?

@szaimen szaimen requested review from a team and nickvergessen and removed request for a team and nickvergessen November 19, 2021 21:18
@szaimen szaimen requested review from artonge and Pytal and removed request for a team November 19, 2021 21:19
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Copy link
Contributor

artonge commented Nov 22, 2021

@szaimen manually compiled, shall we merge this ?

@szaimen
Copy link
Contributor Author

szaimen commented Nov 22, 2021

@szaimen manually compiled, shall we merge this ?

Thanks! Fine by me, yes :)

@artonge
Copy link
Contributor

artonge commented Nov 22, 2021

@Pytal @PVince81, one of you could approve and merge?

@szaimen
Copy link
Contributor Author

szaimen commented Nov 22, 2021

@Pytal @PVince81, one of you could approve and merge?

This one is also still pending: #29628

@MichaIng MichaIng merged commit fb701e3 into stable21 Nov 23, 2021
@MichaIng MichaIng deleted the backport/29611/stable21 branch November 23, 2021 02:54
This was referenced Jan 7, 2022
@Pytal
Copy link
Member

Pytal commented Mar 1, 2022

/backport to stable20

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 1, 2022

The backport to stable20 failed. Please do this backport manually.

#31391

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants