Skip to content
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

Update submodule reference for vendor/postgres-v14 #8913

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

hlinnaka
Copy link
Contributor

@hlinnaka hlinnaka commented Sep 4, 2024

There was a confusion on the REL_14_STABLE_neon branch. PR neondatabase/postgres#471 was merged ot the branch, but the corresponding PRs on the other REL_15_STABLE_neon and REL_16_STABLE_neon branches were not merged. Also, the submodule reference in the neon repository was never updated, so even though the REL_14_STABLE_neon branch contained the commit, it was never used.

That PR neondatabase/postgres#471 was a few bricks shy of a load (no tests, some differences between the different branches), so to get us to a good state, revert that change from the REL_14_STABLE_neon branch. This PR in the neon repository updates the submodule reference past two commites on the REL_14_STABLE_neon branch: first the commit from PR
neondatabase/postgres#471, and immediately after that the revert of the same commit. This brings us back to square one, but now the submodule reference matches the tip of the REL_14_STABLE_neon branch again.

There was a confusion on the REL_14_STABLE_neon branch. PR
neondatabase/postgres#471 was merged ot the
branch, but the corresponding PRs on the other REL_15_STABLE_neon and
REL_16_STABLE_neon branches were not merged. Also, the submodule
reference in the neon repository was never updated, so even though the
REL_14_STABLE_neon branch contained the commit, it was never used.

That PR neondatabase/postgres#471 was a few
bricks shy of a load (no tests, some differences between the different
branches), so to get us to a good state, revert that change from the
REL_14_STABLE_neon branch. This PR in the neon repository updates the
submodule reference past two commites on the REL_14_STABLE_neon
branch: first the commit from PR
neondatabase/postgres#471, and immediately
after that the revert of the same commit. This brings us back to
square one, but now the submodule reference matches the tip of the
REL_14_STABLE_neon branch again.
@hlinnaka hlinnaka requested a review from a team as a code owner September 4, 2024 11:43
@hlinnaka hlinnaka requested a review from knizhnik September 4, 2024 11:43
@hlinnaka
Copy link
Contributor Author

hlinnaka commented Sep 4, 2024

Corresponding postgres repo PR: neondatabase/postgres#479. Please approve that too.

@hlinnaka hlinnaka requested a review from ololobus September 4, 2024 11:44
Copy link

github-actions bot commented Sep 4, 2024

3822 tests run: 3712 passed, 0 failed, 110 skipped (full report)


Flaky tests (2)

Postgres 16

Postgres 14

Code coverage* (full report)

  • functions: 32.3% (7429 of 22990 functions)
  • lines: 50.5% (60170 of 119097 lines)

* collected from Rust tests only


The comment gets automatically updated with the latest test results
77ed085 at 2024-09-04T12:57:50.969Z :recycle:

@hlinnaka hlinnaka enabled auto-merge (squash) September 4, 2024 13:28
@hlinnaka hlinnaka merged commit 0205ce1 into main Sep 4, 2024
73 checks passed
@hlinnaka hlinnaka deleted the fix-v14-submodule-reference branch September 4, 2024 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants