-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
8256393: Github Actions build on Linux should define OS and GCC versions #1225
Conversation
👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into |
@rwestberg The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hold on a sec. ubuntu-latest
is ubuntu-18.04
, as per GH manual. So this effectively upgrades the whole thing to Ubuntu 20.04, and upgrades GCC then? I think we better stick to current defaults, i.e. ubuntu-18.04
and its GCC.
In JDK-8256277, we did not upgrade MacOS target either...
@@ -88,7 +88,7 @@ jobs: | |||
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true' | |||
|
|||
- name: Build jtreg | |||
run: sh make/build-all.sh ${JAVA_HOME} | |||
run: sh make/build-all.sh ${JAVA_HOME_8_X64} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On ubuntu-20.04 the default Java installation is now set to 11, but jtreg still requires Java 8 for building.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see! Okay then.
Right, currently ubuntu-latest means 18.04, but that is only true for another two weeks (see actions/runner-images#1816 - originally it was also planned for next week). So I think we should go straight for the upcoming latest. |
@@ -88,7 +88,7 @@ jobs: | |||
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true' | |||
|
|||
- name: Build jtreg | |||
run: sh make/build-all.sh ${JAVA_HOME} | |||
run: sh make/build-all.sh ${JAVA_HOME_8_X64} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see! Okay then.
@rwestberg This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 80 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
All right, changing this today makes sense to me. |
run: sudo apt-get install libxrandr-dev libxtst-dev libcups2-dev libasound2-dev | ||
run: | | ||
sudo apt-get install libxrandr-dev libxtst-dev libcups2-dev libasound2-dev | ||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should use apt-get functionality to install a specific version of packages? I'm not sure how relevant it is for the X and alsa libraries since they change very seldom, but perhaps for gcc, to get a specific point release of the compiler.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something along the lines of sudo apt-get install gcc-10=10.2.0-5ubuntu1~20
, which I believe should match quite well the version used internally in the Oracle CI builds.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds reasonable, I don't know how often these change in Ubuntu LTS, but can't hurt to be explicit here as well.
Mailing list message from Tiago Daitx on build-dev: Hi,
Why does jtreg need OpenJDK-8 for building? On Debian/Ubuntu we have Please note that while we replace "source/target" for "release", one Cheers! -- PGP Key: 4096R/F5B213BE (hkp://keyserver.ubuntu.com) |
Fair enough, the 1.8 requirement comes from using build-all.sh which checks this explicitly. But I'd rather leave changing how we build jtreg for a separate change.. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTMN.
/integrate |
@rwestberg Since your change was applied there have been 90 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit c45ab1a. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
We should be more explicit about OS and compiler versions used in the GitHub Actions builds, to avoid problems caused by unexpected changes to the defaults. This patch changes the OS and GCC versions used from ubuntu-latest (currently 18.04, but will change to 20.04 sometime soon) / default (currently 9.3.0) to 20.04 / 10.2.0.
Progress
Testing
Issue
Reviewers
Download
$ git fetch https://git.openjdk.java.net/jdk pull/1225/head:pull/1225
$ git checkout pull/1225