Skip to content
This repository has been archived by the owner. It is now read-only.

8269148: Update minor GCC version in GitHub Actions pipeline #120

Closed
wants to merge 1 commit into from

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Jun 22, 2021

It seems Ubuntu had bumped the version for GCC, so GHA started to fail with e.g.:

The following packages have unmet dependencies:
 g++-10-s390x-linux-gnu : Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
 gcc-10-s390x-linux-gnu : Depends: cpp-10-s390x-linux-gnu (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
                          Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
E: Unable to correct problems, you have held broken packages.
Error: Process completed with exit code 100.

I believe we should just update to 10.3.0-1ubuntu1~20.04.

Additional testing:

  • GitHub Actions, package installation steps work
  • GitHub Actions, the builds complete

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8269148: Update minor GCC version in GitHub Actions pipeline

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17 pull/120/head:pull/120
$ git checkout pull/120

Update a local copy of the PR:
$ git checkout pull/120
$ git pull https://git.openjdk.java.net/jdk17 pull/120/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 120

View PR using the GUI difftool:
$ git pr show -t 120

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17/pull/120.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 22, 2021

👋 Welcome back shade! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2021

@shipilev The following label will be automatically applied to this pull request:

  • build

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.

@openjdk openjdk bot added the build label Jun 22, 2021
@shipilev shipilev force-pushed the JDK-8269148-update-gha-gcc branch from 48b287e to 9645acd Jun 22, 2021
@shipilev shipilev changed the title 8269148: GitHub actions should use updated minor GCC version 8269148: Update minor GCC version in GitHub Actions pipeline Jun 22, 2021
@shipilev shipilev marked this pull request as ready for review Jun 22, 2021
@openjdk openjdk bot added the rfr label Jun 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 22, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2021

@shipilev 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:

8269148: Update minor GCC version in GitHub Actions pipeline

Reviewed-by: erikj, dholmes, xliu

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 2 new commits pushed to the master branch:

  • ab7ff1e: 8266885: [aarch64] Crash with 'Field too big for insn' for some tests under compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/
  • 35e4c27: 8268404: [TESTBUG] tools/jpackage/windows/WinInstallerIconTest.java failed "AssertionError: Failed: Check icon"

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jun 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 22, 2021

Mailing list message from David Holmes on build-dev:

On 23/06/2021 5:38 am, Xin Liu wrote:

On Tue, 22 Jun 2021 17:20:14 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

It seems Ubuntu had bumped the version for GCC, so GHA started to fail with e.g.:

The following packages have unmet dependencies:
g++-10-s390x-linux-gnu : Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
gcc-10-s390x-linux-gnu : Depends: cpp-10-s390x-linux-gnu (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
E: Unable to correct problems, you have held broken packages.
Error: Process completed with exit code 100.

I believe we should just update to `10.3.0-1ubuntu1~20.04`.

Additional testing:
- [x] GitHub Actions, package installation steps work
- [ ] GitHub Actions, the builds complete

.github/workflows/submit.yml line 175:

173: run: |
174: sudo apt-get update
175: sudo apt-get install gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev

One dummy question:
Why do we need to specify the real package name here?
If we install gcc-10, I think apt system will pick up the latest gcc-10 for us.

IIRC the intent is to keep control over the gcc version and not randomly
update whenever the distro updates. Upgrading compiler versions for the
OpenJDK is actually a very involved process when done properly and we
often find code changes need to be made, or warnings adjusted, when a
new version of the compiler is to be used. This approach forces us to
check the new version is okay before switching over to it. At least that
is the theory. :)

Cheers,
David

1 similar comment
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 22, 2021

Mailing list message from David Holmes on build-dev:

On 23/06/2021 5:38 am, Xin Liu wrote:

On Tue, 22 Jun 2021 17:20:14 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

It seems Ubuntu had bumped the version for GCC, so GHA started to fail with e.g.:

The following packages have unmet dependencies:
g++-10-s390x-linux-gnu : Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
gcc-10-s390x-linux-gnu : Depends: cpp-10-s390x-linux-gnu (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
E: Unable to correct problems, you have held broken packages.
Error: Process completed with exit code 100.

I believe we should just update to `10.3.0-1ubuntu1~20.04`.

Additional testing:
- [x] GitHub Actions, package installation steps work
- [ ] GitHub Actions, the builds complete

.github/workflows/submit.yml line 175:

173: run: |
174: sudo apt-get update
175: sudo apt-get install gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev

One dummy question:
Why do we need to specify the real package name here?
If we install gcc-10, I think apt system will pick up the latest gcc-10 for us.

IIRC the intent is to keep control over the gcc version and not randomly
update whenever the distro updates. Upgrading compiler versions for the
OpenJDK is actually a very involved process when done properly and we
often find code changes need to be made, or warnings adjusted, when a
new version of the compiler is to be used. This approach forces us to
check the new version is okay before switching over to it. At least that
is the theory. :)

Cheers,
David

@navyxliu
Copy link
Contributor

@navyxliu navyxliu commented Jun 22, 2021

Thanks for the explanation. The reason I ask because I guess we need to review every minor gcc updates in the future.
For a sizeable c/c++ project, it indeed needs extra caution to bump tool-chains.
LGTM.

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Jun 23, 2021

There is a new crash in a vector compiler test that we have not seen before in any of our testing. Could it be related to the change in gcc version?

@navyxliu
Copy link
Contributor

@navyxliu navyxliu commented Jun 23, 2021

This PR doesn't touch anything for linux_x86, but the crash happened on linux-x86 platform as well.
Therefore, it's very unlikely to be caused by toolchains change.

I think it's JDK-8269179

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 23, 2021

Mailing list message from David Holmes on build-dev:

On 23/06/2021 10:23 am, Xin Liu wrote:

On Tue, 22 Jun 2021 17:20:14 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

It seems Ubuntu had bumped the version for GCC, so GHA started to fail with e.g.:

The following packages have unmet dependencies:
g++-10-s390x-linux-gnu : Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
gcc-10-s390x-linux-gnu : Depends: cpp-10-s390x-linux-gnu (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
E: Unable to correct problems, you have held broken packages.
Error: Process completed with exit code 100.

I believe we should just update to `10.3.0-1ubuntu1~20.04`.

Additional testing:
- [x] GitHub Actions, package installation steps work
- [ ] GitHub Actions, the builds complete

This PR doesn't touch anything for linux_x86, but the crash happened on linux-x86 platform as well.

The change on line 175 is within the linux-x64 build definition ???

Therefore, it's very unlikely to be caused by toolchains change.

I think it's JDK-8269179

:) That is the bug I filed for this very crash. But I see Jie Fu has now
determined the cause.

Thanks,
David

1 similar comment
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 23, 2021

Mailing list message from David Holmes on build-dev:

On 23/06/2021 10:23 am, Xin Liu wrote:

On Tue, 22 Jun 2021 17:20:14 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

It seems Ubuntu had bumped the version for GCC, so GHA started to fail with e.g.:

The following packages have unmet dependencies:
g++-10-s390x-linux-gnu : Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
gcc-10-s390x-linux-gnu : Depends: cpp-10-s390x-linux-gnu (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
Depends: gcc-10-s390x-linux-gnu-base (= 10.2.0-5ubuntu1~20.04cross1) but 10.3.0-1ubuntu1~20.04cross1 is to be installed
E: Unable to correct problems, you have held broken packages.
Error: Process completed with exit code 100.

I believe we should just update to `10.3.0-1ubuntu1~20.04`.

Additional testing:
- [x] GitHub Actions, package installation steps work
- [ ] GitHub Actions, the builds complete

This PR doesn't touch anything for linux_x86, but the crash happened on linux-x86 platform as well.

The change on line 175 is within the linux-x64 build definition ???

Therefore, it's very unlikely to be caused by toolchains change.

I think it's JDK-8269179

:) That is the bug I filed for this very crash. But I see Jie Fu has now
determined the cause.

Thanks,
David

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jun 23, 2021

I am integrating this to unbreak the testing.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 23, 2021

Going to push as commit ce917b2.
Since your change was applied there have been 2 commits pushed to the master branch:

  • ab7ff1e: 8266885: [aarch64] Crash with 'Field too big for insn' for some tests under compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/
  • 35e4c27: 8268404: [TESTBUG] tools/jpackage/windows/WinInstallerIconTest.java failed "AssertionError: Failed: Check icon"

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 23, 2021

@shipilev Pushed as commit ce917b2.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@shipilev shipilev deleted the JDK-8269148-update-gha-gcc branch Jul 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
4 participants