Merge 1.2-rc into develop

[jjyr]

No description provided.

[gw-bot]

Running integration test

Workflow Run Id: 2501626608

Components:

• prebuilds: v1.1-202205301006,v1.1
• godwoken: ebef0fd
• scripts: prebuilds 03011e0
• polyjuice: prebuilds 2607851
• kicker: 0577349
• tests: fb990b6

Manually running integration test

Post a comment contains

/itest
[prebuilds: tag]
[godwoken: branch/ref]
[scripts: branch/ref]
[polyjuice: branch/ref]
[web3: branch/ref]
[kicker: branch/ref]
[tests: branch/ref]

Note: [] means optional, for example

/itest
prebuilds: dev-202203280240
godwoken: develop
scripts: 81676d9d53ffdf5bbaa60483928d07da16eb4a88
polyjuice: e37553b9

Run Result

failure

[blckngm]

This will create duplicated commits in develop. Cherry-picking the last commit is enough. I tried git merge origin/1.2-rc to develop and git cherry-pick ebef0fd3d3fee096d6603093ae2624820a9c20c1 from develop, the result is the same:

$ git log develop
commit 8c721d9f490abfc148cac675a97de4ee746f7d58 (develop)
Merge: 6905a787 ebef0fd3
Author: Yin Guanhao <[email protected]>
Date:   Wed Jun 15 20:19:38 2022 +0800

    Merge remote-tracking branch 'origin/1.2-rc' into develop

commit ebef0fd3d3fee096d6603093ae2624820a9c20c1 (tag: v1.2.1-rc1, origin/1.2-rc)
...
$ git log
commit 0103e22b121635ad7e566b25b3b5e3f8fae1362a (HEAD -> develop-and-1.2)
Author: jjy <[email protected]>
Date:   Wed Jun 15 17:02:29 2022 +0800

    chore: release v1.2.1-rc1

commit 6905a7872734befa8d33c1985db95ec3082fdd03 (origin/develop, origin/HEAD)
...
$ git diff develop
(no output)

[jjyr]

This will create duplicated commits in develop. Cherry-picking the last commit is enough. I tried git merge origin/1.2-rc to develop and git cherry-pick ebef0fd3d3fee096d6603093ae2624820a9c20c1 from develop, the result is the same:

$ git log develop
commit 8c721d9f490abfc148cac675a97de4ee746f7d58 (develop)
Merge: 6905a787 ebef0fd3
Author: Yin Guanhao <[email protected]>
Date:   Wed Jun 15 20:19:38 2022 +0800

    Merge remote-tracking branch 'origin/1.2-rc' into develop

commit ebef0fd3d3fee096d6603093ae2624820a9c20c1 (tag: v1.2.1-rc1, origin/1.2-rc)
...
$ git log
commit 0103e22b121635ad7e566b25b3b5e3f8fae1362a (HEAD -> develop-and-1.2)
Author: jjy <[email protected]>
Date:   Wed Jun 15 17:02:29 2022 +0800

    chore: release v1.2.1-rc1

commit 6905a7872734befa8d33c1985db95ec3082fdd03 (origin/develop, origin/HEAD)
...
$ git diff develop
(no output)

I will use squash merge