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

BLADE-742 support quarter release #319

Closed
wants to merge 3 commits into from
Closed

Conversation

simonjhy
Copy link
Contributor

@simonjhy simonjhy commented Feb 5, 2024

No description provided.

@@ -50,6 +51,8 @@ public class WorkspaceConstants {

public static final String DEFAULT_WORKSPACE_PRODUCT_PROPERTY = "liferay.workspace.product";

public static final Pattern dxpQuarterReleaseVersionPattern = Pattern.compile(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just asking to be broken in the future. Can we do without this pattern?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we could. I will change it.

public static Map<String, Object> getProductInfos() {
return getProductInfos(false, null);
@SuppressWarnings("unchecked")
public static ProductInfo getProductInfo(String productKey) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ProductInfo should be renamed to ReleaseInfo, since the information is coming from releases.json

_releaseDate = _safeGet(productMap, "releaseDate", "");
_targetPlatformVersion = _safeGet(productMap, "targetPlatformVersion", "");
_promoted = Boolean.parseBoolean(_safeGet(productMap, "promoted", "false"));
public ProductInfo(ProductKeyInfo productKeyInfo, Properties releaseProperties) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be ReleaseInfo

@@ -121,6 +122,20 @@ public void testBladeInitEmptyDirectoryHandleTwoDots() throws Exception {
Assert.assertNotNull(bladeTest.getWorkspaceProvider(emptyDir));
}

@Ignore
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do we need to ignore?

downloadProductInfo {
src "https://releases-cdn.liferay.com/tools/workspace/.product_info.json"
downloadReleasesInfo {
src "http://localhost:3000/releases.json"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The releases.json should be available on a real server somewhere before we merge this. Otherwise the tests won't be valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gamerson Thanks a lot. This is just a test url before we get the final descision for release info. Because we don't have the completely relases.json, I just put here to let you and drew to do some review. I will do other changes base on your review comments.

@drewbrokke
Copy link
Member

@simonjhy I spoke further with Zsolt. He will make some adjustments to the format of the releases.json file, including merging them. We can talk more on Monday or Tuesday about the specifics. One of the key changes is that he will try to sort the releases.json file on the server side, meaning all Blade has to do is filter.

@simonjhy
Copy link
Contributor Author

simonjhy commented Feb 10, 2024

@simonjhy I spoke further with Zsolt. He will make some adjustments to the format of the releases.json file, including merging them. We can talk more on Monday or Tuesday about the specifics. One of the key changes is that he will try to sort the releases.json file on the server side, meaning all Blade has to do is filter.

@drewbrokke 1)About the releases.json. Will we still plan to use two different releases.json files for dxp and portal base on jira ticket description we ? 2) We could sort all product key in our side codes base on the four elements(product, quarterly, liferayProductVersion and release date) now. Sure. We can discuss it on next Tuesday. Thank you.

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

Successfully merging this pull request may close these issues.

3 participants