LPS-116201 Update liferay-ckeditor version in portal and implement changes to make it fit with new skin #66

carloslancha · 2020-06-29T21:09:02Z

https://issues.liferay.com/browse/LPS-116201

Updating liferay-ckeditor version in portal in order to apply the new skin we created following Lexicon's specs.

Test plan:

Go to Product Menu / Content & Data / Web Content / New Basic Web Content (or ay other place with an editor)
Play with the editor, check the icons and the styling.

liferay-continuous-integration · 2020-06-29T21:09:10Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

carloslancha · 2020-06-29T21:15:17Z

ci:test:sf

liferay-continuous-integration · 2020-06-29T21:19:38Z

❌ ci:test:sf - 0 out of 1 jobs passed in 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: cbfe1d56e513c6fc0a2fecc7e29a7bb11af539c0

Sender Branch:

Branch Name: LPS-116201-moono-lexicon
Branch GIT ID: 5fff3e8da5fd8f52396a9988daf697e4395a6444

0 out of 1jobs PASSED

1 Failed Jobs:

~~test-portal-source-format~~

For more details click here.

format-source-all:
 [sync-dir] Synchronizing /opt/dev/projects/github/liferay-binaries-cache-2020/.gradle/caches/modules-2/files-2.1 into /opt/dev/projects/github/liferay-portal/.gradle/caches/modules-2/files-2.1
 [sync-dir] 0 files synchronized in 479ms
     [echo] Executing Gradle task: :yarnCheckFormat
     [exec] Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=256m; support was removed in 8.0
     [exec] Configuration on demand is an incubating feature.
     [exec] 
     [exec] > Task :yarnCheckFormat
     [exec] Running the Yarn "checkFormat" script
     [exec] 
     [exec] > Task :downloadNode SKIPPED
     [exec] 
     [exec] > Task :yarnCheckFormatModules
     [exec] yarn run v1.13.0
     [exec] \$ liferay-npm-scripts check --production false
     [exec] apps/frontend-theme/frontend-theme-styled/src/main/resources/META-INF/resources/_styled/css/application/_editor_html.scss: BAD
     [exec] Prettier checked 3 files, 1 file has problems
     [exec] 
     [exec] 1 of 3 jobs failed
     [exec] info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
     [exec] error Command failed with exit code 1.
     [exec] 
     [exec] > Task :yarnCheckFormatModules FAILED
     [exec] Gradle build finished at 2020-06-29 21:19:26.622.
     [exec] 
     [exec] 
     [exec] FAILURE: Build failed with an exception.
     [exec] 
     [exec] * What went wrong:
     [exec] Execution failed for task ':yarnCheckFormatModules'.
     [exec] > Process 'command '/opt/dev/projects/github/liferay-portal/build/node/bin/node'' finished with non-zero exit value 1
     [exec] 
     [exec] * Try:
     [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
     [exec] 
     [exec] * Exception is:
     [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':yarnCheckFormatModules'.
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter\$3.accept(ExecuteActionsTaskExecuter.java:166)
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter\$3.accept(ExecuteActionsTaskExecuter.java:163)
     [exec] 	at org.gradle.internal.Try\$Failure.ifSuccessfulOrElse(Try.java:191)
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:156)

carloslancha · 2020-06-29T21:30:15Z

ci:test:sf

liferay-continuous-integration · 2020-06-29T21:33:56Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 625436142a5584d169b7c3cb42366cfc3ad0dc57

Sender Branch:

Branch Name: LPS-116201-moono-lexicon
Branch GIT ID: 3056b192e895239b817d6e149b4bbac2dceb66ea

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

carloslancha · 2020-06-29T21:34:48Z

@jbalsas should we wait until GA4 is released before merging this?

carloslancha · 2020-06-29T21:39:59Z

ci:test:relevant

liferay-continuous-integration · 2020-06-30T00:34:44Z

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 48 out of 51 jobs passed in 2 hours 54 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 625436142a5584d169b7c3cb42366cfc3ad0dc57

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 132b6a6de2529323e7ade179ae4e1386e97be5cb

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 48 out of 51 jobs PASSED

3 Failed Jobs:

48 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/semantic-versioning-jdk8

Job Results:

0 Tests Passed.
1 Test Failed.

AXIS_VARIABLE=0,label_exp=!master #420564

clean-up-java-processes:
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/clean_up_java_processes.sh
[stopwatch] [run.batch.test.setup: 24:35.781 sec]
     [echo] run.batch.test.action.start.timestamp: 06-29-2020 15:50:03:336 PDT
     [echo] Checking for baseline log files.
     [echo] 
     [echo] ##
     [echo] ## /opt/dev/projects/github/liferay-portal/baseline-reports/portal-impl-5.log
     [echo] ##
     [echo] 
     [echo] [Baseline Warning] Bundle Version Change Recommended: 5.11.4
[stopwatch] [run.batch.test.action: 12.276 sec]
     [echo] Semantic versioning is incorrect.
      [get] Getting: http://test-1-2/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=0,label_exp=!master/420564//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20200629155015613.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20200629155015613.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null846153269.properties

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1
Job Results:
6 Tests Passed.
2 Tests Failed.
1. AXIS_VARIABLE=0,label_exp=!master #161052
  1. LocalFile.PGBlogs#EmbedVideo - Poshi Report - Poshi Summary - Console Output
  2. LocalFile.PGBlogs#RemoveSmallImage - Poshi Report - Poshi Summary - Console Output

For upstream results, click here.

liferay-continuous-integration · 2020-06-30T00:41:08Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#6493
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:liferay-frontend#66
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:relevant
Spira Release Build:master - carloslancha > liferay-frontend - PR#66
Spira Jenkins Build:publish-spira-report#2441

wincent · 2020-06-30T08:24:47Z

As per Slack thread, we might want to merge liferay/liferay-ckeditor#78 and cut a release so as to avoid adding to the dependency foot-print. (At least, it's my understanding that the new deps added to liferay-ckeditor should be build-only deps.)

wincent · 2020-06-30T08:30:59Z

should we wait until GA4 is released before merging this?

Currently targeting Thursday for release, so I'd say it is quite reasonable to wait a couple of days if you feel like there is some risk involved here. FWIW, if you've manually tested it in a few places and checked IE, then it is probably ok.

jbalsas · 2020-06-30T12:14:55Z

...rontend/editor/ckeditor/web/internal/editor/configuration/BaseCKEditorConfigContributor.java

@@ -60,7 +60,8 @@ public void populateConfigJSONObject(
 				HtmlUtil.escape(
 					PortalUtil.getStaticResourceURL(
 						themeDisplay.getRequest(),
-						"/o/frontend-css-web/main.css")))
+						"/o/frontend-editor-ckeditor-web/ckeditor/skins" +


Is this really needed? I'd expect CKEditor to load this automatically when passing in a different skin?

Checked, we don't need this :D

Did we set the skin to be the default in our build process in liferay-ckeditor?

Yep https://github.com/liferay/liferay-ckeditor/blob/master/support/build-config.js#L9

jbalsas

Based on the changes, I think we're failing to properly set the skin through configuration.

My guess is that we're still loading moono.css and now moono-lexicon.css on top. We should set config option to moono-lexicon and let CKEditor do the rest.

Could we double-check this?

jbalsas · 2020-06-30T14:25:04Z

modules/yarn.lock

@@ -5324,6 +5333,11 @@ chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==

+chownr@^2.0.0:


Removed in last commit

carloslancha · 2020-06-30T19:03:10Z

@wincent @jbalsas released liferay-ckeditor.4.13.1-liferay.8 and updated it in portal

liferay-continuous-integration · 2020-07-09T13:30:08Z

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 50 out of 52 jobs passed in 1 hour 42 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: dfa080768228be927b37085a56e541c05ce0f072

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 26d9c30572aa163b37c2bdb9a90c3ef3cbf122b3

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 50 out of 52 jobs PASSED

2 Failed Jobs:

50 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/1

Job Results:

0 Tests Passed.
1 Test Failed.

AXIS_VARIABLE=0,label_exp=!master #404494

[CucumberReport] Copied 0 properties files from workspace "/opt/dev/projects/github/liferay-jenkins-ee/test-results/cucumber/build/reports/json" to reports directory "/opt/java/jenkins/jobs/test-portal-acceptance-pullrequest-batch(master)/configurations/axis-AXIS_VARIABLE/0/axis-label_exp/!master/builds/404494/cucumber-html-reports/.cache"
[CucumberReport] Processing 0 json files:
[CucumberReport] Missing report result - report was not successfully completed
[CucumberReport] Build status is left unchanged
[PostBuildScript] - Executing post build scripts.
define: [LabelParameterValue: NODE_NAME=cloud-10-0-110-29]
Triggering projects: verification-node
[liferay-jenkins-ee] $ /bin/bash -e -x /tmp/jenkins8092428214514130232.sh
+ echo 'Update the workspace repository for post-build steps.'
Update the workspace repository for post-build steps.
+ git clean -d -f -x
+ git reset --hard
+ set +e
+ git show-ref --verify --quiet refs/heads/master-temp-1594298209723
+ VERIFY_BRANCH_RESULT=1
+ set -e
+ [[ 1 == 0 ]]
+ git checkout master
error: pathspec 'master' did not match any file(s) known to git.
[liferay-jenkins-ee] $ /bin/bash -e -x /tmp/jenkins1728722356383573316.sh
+ echo 'Execute: build-test-portal-acceptance-pullrequest-batch.sh stop-current-job'
Execute: build-test-portal-acceptance-pullrequest-batch.sh stop-current-job
+ commands/build-test-portal-acceptance-pullrequest-batch.sh stop-current-job
/tmp/jenkins1728722356383573316.sh: line 5: commands/build-test-portal-acceptance-pullrequest-batch.sh: No such file or directory
[EnvInject] - Injecting environment variables from a build step.
[EnvInject] - [ERROR] - The given properties file path '/opt/dev/projects/github/liferay-jenkins-ee/stop.properties' doesn't exist.
[EnvInject] - [ERROR] - Missing file path was resolved from pattern '${WORKSPACE}/stop.properties' .
[EnvInject] - [ERROR] - Problems occurs on injecting env vars as a build step: java.io.IOException: The given properties file path '/opt/dev/projects/github/liferay-jenkins-ee/stop.properties' doesn't exist.
[description-setter] Description set: ${BUILD_DESCRIPTION}
Build step 'Execute Scripts' marked build as failure
Finished: FAILURE

For upstream results, click here.

julien · 2020-07-09T13:31:48Z

I'm not sure the last CI error is related to our change, but if @john-co can confirm that would be great

liferay-continuous-integration · 2020-07-09T13:32:54Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#6151
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:liferay-frontend#66
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:relevant
Spira Release Build:master - carloslancha > liferay-frontend - PR#66
Spira Jenkins Build:publish-spira-report#3993

jbalsas · 2020-07-09T16:19:00Z

ci:test:relevant

jbalsas · 2020-07-09T16:19:17Z

Running it again, just in case... @john-co, could you please do some manual smoke tests on this, just to be sure?

john-co · 2020-07-09T16:43:23Z

It looks like the same error is coming from tests ran on test-1-17 similar to #90 (comment). test-1-17 is now taken offline, and I think it shouldn't affect the current pending run.

liferay-continuous-integration · 2020-07-09T17:34:00Z

✔️ ci:test:stable - 20 out of 20 jobs passed

✔️ ci:test:relevant - 52 out of 52 jobs passed in 1 hour 14 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 678e0cdde7e1364a6cbd1db1ac673384542da199

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 26d9c30572aa163b37c2bdb9a90c3ef3cbf122b3

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 52 out of 52 jobs PASSED

52 Successful Jobs:

For more details click here.

liferay-continuous-integration · 2020-07-09T17:37:14Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#6487
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:liferay-frontend#66
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:relevant
Spira Release Build:master - carloslancha > liferay-frontend - PR#66
Spira Jenkins Build:publish-spira-report#364

jbalsas · 2020-07-09T19:26:15Z

ci:forward

liferay-continuous-integration · 2020-07-09T19:26:24Z

CI is automatically triggering the following test suites:

ci:test:relevant
ci:test:sf

The pull request will automatically be forwarded to the user brianchandotcom if the following test suites pass:

ci:test:relevant
ci:test:sf
ci:test:stable

liferay-continuous-integration · 2020-07-09T19:26:25Z

Skipping previously passed test suites:
ci:test:relevant
ci:test:sf

liferay-continuous-integration · 2020-07-09T19:27:39Z

All required test suite(s) passed.
Forwarding pullrequest to brianchandotcom.

liferay-continuous-integration · 2020-07-09T19:28:07Z

Pull request has been successfully forwarded to brianchandotcom#91140

carloslancha · 2020-07-10T08:29:55Z

Thx for the review @john-co and @jbalsas for the nightly forward!

carloslancha requested review from wincent and jbalsas June 29, 2020 21:14

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - failure and removed ci:test:sf - pending labels Jun 29, 2020

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - success and removed ci:test:sf - failure ci:test:sf - pending labels Jun 29, 2020

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Jun 29, 2020

jbalsas reviewed Jun 30, 2020

View reviewed changes

liferay-continuous-integration added ci:test:relevant - failure ci:test:stable - success and removed ci:test:stable - pending labels Jul 9, 2020

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending and removed ci:test:relevant - failure ci:test:stable - success labels Jul 9, 2020

liferay-continuous-integration added ci:test:relevant - success ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Jul 9, 2020

jbalsas added forwarding and removed needs update labels Jul 9, 2020

liferay-continuous-integration mentioned this pull request Jul 9, 2020

LPS-116201 Update liferay-ckeditor version in portal and implement changes to make it fit with new skin brianchandotcom/liferay-portal#91140

Closed

liferay-continuous-integration closed this Jul 9, 2020

carloslancha deleted the LPS-116201-moono-lexicon branch July 20, 2020 21:55

LPS-116201 Update liferay-ckeditor version in portal and implement changes to make it fit with new skin #66

LPS-116201 Update liferay-ckeditor version in portal and implement changes to make it fit with new skin #66

Conversation

carloslancha commented Jun 29, 2020 • edited

liferay-continuous-integration commented Jun 29, 2020

carloslancha commented Jun 29, 2020

liferay-continuous-integration commented Jun 29, 2020

❌ ci:test:sf - 0 out of 1 jobs passed in 3 minutes

Base Branch:

Sender Branch:

1 Failed Jobs:

For more details click here.

carloslancha commented Jun 29, 2020

liferay-continuous-integration commented Jun 29, 2020

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Base Branch:

Sender Branch:

For more details click here.

carloslancha commented Jun 29, 2020 • edited

carloslancha commented Jun 29, 2020

liferay-continuous-integration commented Jun 30, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 48 out of 51 jobs passed in 2 hours 54 minutes

Base Branch:

Copied in Private Modules Branch:

3 Failed Jobs:

For more details click here.

Failures unique to this pull:

Job Results:

Job Results:

For upstream results, click here.

liferay-continuous-integration commented Jun 30, 2020

wincent commented Jun 30, 2020

wincent commented Jun 30, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbalsas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carloslancha commented Jun 30, 2020

liferay-continuous-integration commented Jul 9, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 50 out of 52 jobs passed in 1 hour 42 minutes

Base Branch:

Copied in Private Modules Branch:

2 Failed Jobs:

For more details click here.

Failures unique to this pull:

Job Results:

For upstream results, click here.

julien commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

jbalsas commented Jul 9, 2020

jbalsas commented Jul 9, 2020

john-co commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

✔️ ci:test:relevant - 52 out of 52 jobs passed in 1 hour 14 minutes

Base Branch:

Copied in Private Modules Branch:

For more details click here.

liferay-continuous-integration commented Jul 9, 2020

jbalsas commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

liferay-continuous-integration commented Jul 9, 2020

carloslancha commented Jul 10, 2020

carloslancha commented Jun 29, 2020 •

edited

carloslancha commented Jun 29, 2020 •

edited