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

rework jdk toolchain 17 & 21 #3392

Merged
merged 4 commits into from
Mar 2, 2024
Merged

rework jdk toolchain 17 & 21 #3392

merged 4 commits into from
Mar 2, 2024

Conversation

c8ef
Copy link
Member

@c8ef c8ef commented Mar 2, 2024

  • Before adding new features and new modules, please go to issues to submit the relevant feature description first.
  • Write good commit messages and use the same coding conventions as the rest of the project.
  • Please commit code to dev branch and we will merge into master branch in feature
  • Ensure your edited codes with four spaces instead of TAB.

  • 增加新特性和新模块之前,请先到issues提交相关特性说明,经过讨论评估确认后,再进行相应的代码提交,避免做无用工作。
  • 编写友好可读的提交信息,并使用与工程代码相同的代码规范,代码请用4个空格字符代替tab缩进。
  • 请提交代码到dev分支,如果通过,我们会在特定时间合并到master分支上。
  • 为了规范化提交日志的格式,commit消息,不要用中文,请用英文描述。

This pull request accomplishes two main tasks:

  1. It removes the non-LTS version of JDK 20 and adds direct support for JDK 17 and JDK 21 LTS versions, which can now be downloaded directly from Oracle.
  2. It adds support for macOS ARM instances in the CI pipeline. (GitHub provides free access to these instances for public repositories.) (This may be also helpful for folly build on arm64 macos)

os: [macOS-latest]
arch: [x86_64, arm64]
os: [macos-14]
arch: [arm64]
Copy link
Member

Choose a reason for hiding this comment

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

why?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because macos-latest means macos-12, which only has x86 support.

ref: https://github.com/actions/runner-images

Image YAML Label Included Software
Ubuntu 22.04 ubuntu-latest or ubuntu-22.04 ubuntu-22.04
Ubuntu 20.04 ubuntu-20.04 ubuntu-20.04
macOS 14 [beta] macos-14-large macOS-14
macOS 14 Arm64 [beta] macos-14 or macos-14-xlarge macOS-14-arm64
macOS 13 macos-13, macos-13-large or macos-latest-large macOS-13
macOS 13 Arm64 macos-13-xlarge macOS-13-arm64
macOS 12 macos-latest,macos-12 ormacos-12-large macOS-12
macOS 11 [deprecated] macos-11 macOS-11
Windows Server 2022 windows-latest or windows-2022 windows-2022
Windows Server 2019 windows-2019 windows-2019

Copy link
Member Author

Choose a reason for hiding this comment

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

So I think we can use macos-12 for x86 macos, macos-14 for arm macos. (macos-13 x86 give weird error, skip for now)

Copy link
Member Author

Choose a reason for hiding this comment

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

If we don't use the arm64 macos ci, the download jdk binary will give 'Bad CPU type in executable' error.

Copy link
Member

Choose a reason for hiding this comment

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

ok

@c8ef c8ef requested a review from waruqi March 2, 2024 07:02
@waruqi waruqi merged commit 2278b07 into xmake-io:dev Mar 2, 2024
63 checks passed
@c8ef c8ef deleted the jdk branch March 2, 2024 07:55
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.

2 participants