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

LPS-93362 Fix built themes pulling in wrong version of clay-css dependency #70786

Closed
wants to merge 1 commit into from
Closed

Conversation

wincent
Copy link

@wincent wincent commented Apr 4, 2019

Instead of relying on the stale snapshots of liferay-frontend-theme-styled and liferay-frontend-theme-unstyled, which pull in an old version of clay-css, always use the in-repo versions directly.

Test plan:

See that all themes build and deploy, ie. in "modules/apps/", run:

for X in admin classic; do
  (cd frontend-theme/frontend-theme-$X && gradlew clean deploy)
done

for X in fjord westeros-bank porygon; do
  (cd frontend-theme-$X/frontend-theme-$X && gradlew clean deploy)
done

And see these lines in the build output:

Files of project ':apps:frontend-theme:frontend-theme-admin' deployed to /Users/greghurrell/code/portal/bundles/deploy
Files of project ':apps:frontend-theme:frontend-theme-classic' deployed to /Users/greghurrell/code/portal/bundles/osgi/war
Files of project ':apps:frontend-theme-fjord:frontend-theme-fjord' deployed to /Users/greghurrell/code/portal/bundles/deploy
Files of project ':apps:frontend-theme-westeros-bank:frontend-theme-westeros-bank' deployed to /Users/greghurrell/code/portal/bundles/deploy
Files of project ':apps:frontend-theme-porygon:frontend-theme-porygon' deployed to /Users/greghurrell/code/portal/bundles/deploy<Paste>

Look at portal and see header font has reverted to previous, desired size. Note that the yarn.lock no longer pulls in the old clay-css. Also, create three sites with the three marketplaces themes (porygon, westeros-bank and fjord) and see them all render correctly.

widgets

cc: @jbalsas

…dency

Instead of relying on the stale snapshots of
liferay-frontend-theme-styled and liferay-frontend-theme-unstyled, which
pull in an old version of clay-css, always use the in-repo versions
directly.

Test plan:

See that all themes build and deploy, ie. in "modules/apps/", run:

    for X in admin classic; do
      (cd frontend-theme/frontend-theme-$X && gradlew clean deploy)
    done

    for X in fjord westeros-bank porygon; do
      (cd frontend-theme-$X/frontend-theme-$X && gradlew clean deploy)
    done

And see these lines in the build output:

    Files of project ':apps:frontend-theme:frontend-theme-admin' deployed to /Users/greghurrell/code/portal/bundles/deploy
    Files of project ':apps:frontend-theme:frontend-theme-classic' deployed to /Users/greghurrell/code/portal/bundles/osgi/war
    Files of project ':apps:frontend-theme-fjord:frontend-theme-fjord' deployed to /Users/greghurrell/code/portal/bundles/deploy
    Files of project ':apps:frontend-theme-westeros-bank:frontend-theme-westeros-bank' deployed to /Users/greghurrell/code/portal/bundles/deploy
    Files of project ':apps:frontend-theme-porygon:frontend-theme-porygon' deployed to /Users/greghurrell/code/portal/bundles/deploy<Paste>

Look at portal and see header font has reverted to previous, desired
size. Note that the yarn.lock no longer pulls in the old clay-css.
@jbalsas
Copy link

jbalsas commented Apr 4, 2019

Great, thanks @wincent! 👍

@wincent
Copy link
Author

wincent commented Apr 4, 2019

ci:test-sf

@wincent
Copy link
Author

wincent commented Apr 4, 2019

ci:test-relevant

@wincent
Copy link
Author

wincent commented Apr 4, 2019

Closing this in favor of: #70792 (combining this + that + #70791 in order to avoid a merge conflict).

@wincent wincent closed this Apr 4, 2019
@wincent
Copy link
Author

wincent commented Apr 4, 2019

ci:stop

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test - 0 out of 1 jobs passed in 53 minutes 45 seconds 873 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: e3b1f486e3f28c0f86e3fb973c2c4fe6e02c9ceb

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: ef0aa705d8b6baff3b164b2930e6f4ec12b03bdd

0 out of 1 jobs PASSED
For more details click here.

Failures unique to this pull:

  1. test-portal-acceptance-pullrequest(master)
    Job Results:

    0 Jobs Passed.
    1 Job Failed.

    Build was aborted

For upstream results, click here.

@liferay-continuous-integration
Copy link
Collaborator

The pull request tester is still running.

Please wait until you get the final report before running 'ci:retest'.

See this link to check on the status of your test:

@wincent


However, the pull request was closed.

The pull request was closed because the following critical batches had failed:

For information as to why we automatically close out certain pull requests see this article.

*This pull will no longer automatically close if this comment is available. If you believe this is a mistake please reopen this pull by entering the following command as a comment.

ci:reopen


Critical Failure Details:

test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8
Job Results:

4744 Tests Passed.
1 Test Failed.

  1. AXIS_VARIABLE=0,label_exp=!master #246616
    1. GCloudNaturalLanguageUtilTest.testTruncateToSizeTextGreaterThanMaxWithTwoWordsSmallerThanSize
      org.junit.ComparisonFailure: expected:< []> but was:< [ ]>
      	at org.junit.Assert.assertEquals(Assert.java:115)
      	at org.junit.Assert.assertEquals(Assert.java:144)
      	at com.liferay.document.library.asset.auto.tagger.google.cloud.natural.language.internal.util.GCloudNaturalLanguageUtilTest.testTruncateToSizeTextGreaterThanMaxWithTwoWordsSmallerThanSize(GCloudNaturalLanguageUtilTest.java:149)
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
      	at java.lang.reflect.Method.invoke(Method.java:498)
      	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
      	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
      	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
      	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
      	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
      	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
      	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
      	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
      	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
      	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
      	at org.junit.ru...
cc @

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test - 113 out of 197 jobs passed in 2 hours 5 minutes 35 seconds 29 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: e3b1f486e3f28c0f86e3fb973c2c4fe6e02c9ceb

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: ef0aa705d8b6baff3b164b2930e6f4ec12b03bdd

113 out of 197 jobs PASSED

84 Failed Jobs:

113 Successful Jobs:
For more details click here.

Failures unique to this pull:

  1. test-portal-acceptance-pullrequest-batch(master)/functional-smoke-wildfly110-mariadb102-jdk8/0
    Job Results:

    0 Tests Passed.
    1 Test Failed.

    1. AXIS_VARIABLE=0,label_exp=!master #287390
           [exec] * What went wrong:
           [exec] Execution failed for task ':runPoshi'.
           [exec] > There were failing tests. See the report at: file:///opt/dev/projects/github/liferay-portal/portal-web/tests/index.html
           [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 ':runPoshi'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
           [exec] 	at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.run(EventFiringTaskExecuter.java:51)
  2. ...

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