[Sync] 20.1 with upstream

[github-actions]

Automated changes by create-pull-request GitHub action

[graalvmbot]

Hello GitHub Action, thanks for contributing a PR to our project!

We use the Oracle Contributor Agreement to make the copyright of contributions clear. We don't have a record of you having signed this yet, based on your email address action -(at)- github -(dot)- com. You can sign it at that link.

If you think you've already signed it, please comment below and we'll check.

[jerboaa]

@galderz @zakkak I don't think we want to merge this, do we?

[zakkak]

Yes we don't want to merge this and we also don't want to keep popping up so I will disable the auto-sync on 20.1 (and we should probably disable it for all future "release" branches.

[zakkak]

Another thing to keep in mind is that we should use our emails for any automation to make OCA bot happy.

[galderz]

So, shall we just close it for now?

[zakkak]

No, if we close it it will re-open automatically.
We need to:

1. disable the auto PRs
2. re-evaluate our branching scheme (maybe we need to base our branches on graal tags and not on graal branches, e.g. a branch for 20.1.0 and another for 20.1.1. Graal uses branch 20.1 for all 20.1.x tags AFAIU)

[zakkak]

Can be closed after merging #35

[galderz]

e.g. a branch for 20.1.0 and another for 20.1.1.

+1. It seems we need some stable branch for 20.1.0 so that we can backport things as needed, independent of the move forward to 20.1.1.

[galderz]

Merged #35 so closing this.

[jerboaa]

e.g. a branch for 20.1.0 and another for 20.1.1.

+1. It seems we need some stable branch for 20.1.0 so that we can backport things as needed, independent of the move forward to 20.1.1.

I don't think we need a different branch for this to be possible. We can merge 20.1.1 changes at any time we like into a the existing 20.1 mandrel branch. It would be concerning having to maintain per-tag branches. This can be achieved by tagging, IMO. After a merge of 20.1.1 changes into 20.1 tags would become mandrel-20.1.1-DR1 (from mandrel-20.1.0-DR7, say).

[galderz]

@jerboaa Hmmm, that might simplify things actually. It would be easier to chug along with what happens with the micros than the maintenance involved. This would be something to take into account in the discussion in #40. @jerboaa maybe you can reply there too?