Check submodule forward progress #8949
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
8 times, most recently
from
b393d76 to
e54ce82
Compare
hlinnaka
requested review from
bayandin,
a team and
lubennikovaav
and removed request for
a team
|
edit: removed that commit |
5055 tests run: 4891 passed, 0 failed, 164 skipped (full report)Flaky tests (16)Postgres 17
Postgres 16
Postgres 15
Code coverage* (full report)
* collected from Rust tests only The comment gets automatically updated with the latest test results
c4dfdf8 at 2024-09-21T19:11:40.277Z :recycle: |
bayandin
approved these changes
Sep 9, 2024
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
from
e54ce82 to
7fda256
Compare
![orca-security-us[bot]](https://avatars.githubusercontent.com/in/276250?s=60&v=4){kind=small}
There was a problem hiding this comment.
Orca Security Scan Summary
| Status | Check | Issues by priority | |
|---|---|---|---|
 Passed |
Infrastructure as Code |  0  0  0  0 |
View in Orca |
| Passed |
Secrets | 0 0 0 0 |
View in Orca |
| Passed |
Vulnerabilities | 0 0 0 0 |
View in Orca |
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
from
7fda256 to
b9e6386
Compare
hlinnaka
added a commit
that referenced
this pull request
Sep 11, 2024
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them. As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
from
b9e6386 to
0190948
Compare
tristan957
reviewed
Sep 12, 2024
hlinnaka
added a commit
that referenced
this pull request
Sep 16, 2024
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them. As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
5 times, most recently
from
24dd191 to
7cedf5d
Compare
tristan957
reviewed
Sep 16, 2024
|
I just found out that a similar action already exists: https://github.com/jtmullen/submodule-branch-check-action. I did not find that earlier. I'll investigate using that instead.. |
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
5 times, most recently
from
aed5647 to
782e262
Compare
ololobus
approved these changes
Sep 18, 2024
ololobus
reviewed
Sep 18, 2024
hlinnaka
added a commit
that referenced
this pull request
Sep 20, 2024
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them. As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
2 times, most recently
from
4e4a6a4 to
67efddc
Compare
hlinnaka
added a commit
that referenced
this pull request
Sep 20, 2024
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them. As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
from
bc53f6b to
b131ddf
Compare
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them. As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.
Because the checks are fairly expensive, taking about 4 minutes.
…anches The checks were too strict. We want to allow forward progress. The idea is that you merge the main neon repo PR first, and then update the REL_*_STABLE_neon branches, not the other way round.
hlinnaka
force-pushed
the
check-submodule-forward-progress
branch
from
b131ddf to
c4dfdf8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We frequently mess up our submodule references. This adds one safeguard: it checks that the submodule references point to the corresponding REL_*_STABLE_neon branches, or to some commit descending from them.
As next step, I'm thinking that we should automate things so that when you merge a PR to the 'neon' repository that updates the submodule references, the REL_*_STABLE_neon branches are automatically updated to match the submodule references. That way, you never need to manually merge PRs in the postgres repository, it's all triggered from commits in the 'neon' repository. But that's not included here.