Closed jrafanie closed 2 years ago
@jrafanie A conflict occurred during the backport of this pull request to morphy
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the morphy
branch in order to resolve this.
Conflict details:
diff --cc kickstarts/base.ks.erb
index a91979d,591bef4..0000000
--- a/kickstarts/base.ks.erb
+++ b/kickstarts/base.ks.erb
@@@ -26,8 -26,7 +26,12 @@@ timezone --utc America/New_Yor
<%= render_partial "main/db_fs" %>
module --name mod_auth_openidc
++<<<<<<< HEAD
+module --name nodejs --stream 12
+module --name ruby --stream 2.6
++=======
+ module --name ruby --stream 2.7
++>>>>>>> e3f7949 (Merge pull request #513 from jrafanie/drop_nodejs)
reboot
@jrafanie I'll take care of this one.
morphy
backport details:
commit 8df4a0bec8c47b8cf4c59b54f9c53f0ed906aeb2 (HEAD -> morphy, upstream/morphy)
Author: Jason Frey <fryguy9@gmail.com>
Date: Mon Jun 20 12:05:32 2022 -0400
Merge pull request #513 from jrafanie/drop_nodejs
Nodejs is no longer a runtime dependency
(cherry picked from commit e3f7949909ff34234a16f583801d7823d3a35df9)
Backported to najdorf
in commit 682506998249815fc6b5f0280774f9d7c4413f65.
commit 682506998249815fc6b5f0280774f9d7c4413f65
Author: Jason Frey <fryguy9@gmail.com>
Date: Mon Jun 20 12:05:32 2022 -0400
Merge pull request #513 from jrafanie/drop_nodejs
Nodejs is no longer a runtime dependency
(cherry picked from commit e3f7949909ff34234a16f583801d7823d3a35df9)
As of https://github.com/ManageIQ/manageiq-rpm_build/pull/282 and https://github.com/ManageIQ/manageiq-ui-classic/pull/8320 nodejs is a build time dependency to build the rpms and minify the assets but is not needed a runtime.
For https://github.com/ManageIQ/manageiq-ui-classic/issues/8300
NOTE: See https://github.com/ManageIQ/manageiq-ui-classic/issues/8300 for the breakdown of required PRs.