Skip to content
This repository was archived by the owner on Apr 23, 2025. It is now read-only.

Conversation

adietish
Copy link
Contributor

fixes #653

@adietish adietish self-assigned this Jan 15, 2024
@openshift-ci openshift-ci bot requested a review from sbouchet January 15, 2024 10:34
@adietish adietish changed the title corrected helm config for m1/m2 macs (#653) fix: corrected helm config for m1/m2 macs (#653) Jan 15, 2024
@adietish
Copy link
Contributor Author

/override ci/prow/e2e-openshift

Copy link

openshift-ci bot commented Jan 15, 2024

@adietish: Overrode contexts on behalf of adietish: ci/prow/e2e-openshift

In response to this:

/override ci/prow/e2e-openshift

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Collaborator

@sbouchet sbouchet left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

openshift-ci bot commented Jan 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbouchet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 9c08de8 into redhat-developer:main Jan 15, 2024
@adietish adietish deleted the issue-653 branch January 15, 2024 14:00
@adietish
Copy link
Contributor Author

Here's the reference:

Our code gets the OS + architecture: https://github.com/redhat-developer/intellij-common/blob/9c0aae5b4917000596cd192f2ba150c33ca893e5/src/main/java/com/redhat/devtools/intellij/common/utils/DownloadHelper.java#L156C5-L164C6

private ToolsConfig.Platform getPlatformBasedOnOs(ToolsConfig.Tool tool) {
        String osArch = Platform.arch().toString();
        String osId = Platform.os().id();
        if (tool.getPlatforms().containsKey(osId + "-" + osArch)) {
                return tool.getPlatforms().get(osId + "-" + osArch);
        }
        return tool.getPlatforms().get(osId);
}

Platform retrieves the system property os.arch (https://github.com/haraldk/TwelveMonkeys/blob/2325cef5a3c97b724944a0ff5a69a80a463a5d15/common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java#L217C9-L217C48):

 Unknown(System.getProperty("os.arch"));

The system property os.arch on a M1 Mac is aarch64:

$ ✗ java -XshowSettings:properties -version
Property settings:
    file.encoding = UTF-8
    file.separator = /
    java.class.path =
    java.class.version = 61.0
    java.home = /Users/adietish/.sdkman/candidates/java/17.0.9-tem
    java.io.tmpdir = /var/folders/gg/xlwh916954z84y90n54y5l1m0000gn/T/
    java.library.path = /Users/adietish/Library/Java/Extensions
        /Library/Java/Extensions
        /Network/Library/Java/Extensions
        /System/Library/Java/Extensions
        /usr/lib/java
        .
    java.runtime.name = OpenJDK Runtime Environment
    java.runtime.version = 17.0.9+9
    java.specification.name = Java Platform API Specification
    java.specification.vendor = Oracle Corporation
    java.specification.version = 17
    java.vendor = Eclipse Adoptium
    java.vendor.url = https://adoptium.net/
    java.vendor.url.bug = https://github.com/adoptium/adoptium-support/issues
    java.vendor.version = Temurin-17.0.9+9
    java.version = 17.0.9
    java.version.date = 2023-10-17
    java.vm.compressedOopsMode = Zero based
    java.vm.info = mixed mode
    java.vm.name = OpenJDK 64-Bit Server VM
    java.vm.specification.name = Java Virtual Machine Specification
    java.vm.specification.vendor = Oracle Corporation
    java.vm.specification.version = 17
    java.vm.vendor = Eclipse Adoptium
    java.vm.version = 17.0.9+9
    jdk.debug = release
    line.separator = \n
    native.encoding = UTF-8
==>    os.arch = aarch64
    os.name = Mac OS X
    os.version = 14.2.1

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

Successfully merging this pull request may close these issues.

If helm is missing on my M1/M2 mac, I get an error node in the tree, no download is triggered
2 participants