Skip to content

Empty commit to allow a cascading re-targeting of PRs.#6587

Merged
abernix merged 1 commit intodevfrom
next
Jan 20, 2025
Merged

Empty commit to allow a cascading re-targeting of PRs.#6587
abernix merged 1 commit intodevfrom
next

Conversation

@abernix
Copy link
Member

@abernix abernix commented Jan 20, 2025

This follows #6576 which didn't successfully re-target existing PRs, as we expected. We have a theory that this is because of branch protection rules that prevented the deletion of the next branch.

Therefore, this is an empty commit that will try the same PR merge again and hopefully trigger the magical GitHub bots that re-target branches and save us from doing it manually.

Worst case, we will go through and re-target them all manually, but there are a fair dozen of them.

@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Jan 20, 2025

⚠️ Docs preview not attached to branch

The preview was not built because the PR's base branch dev is not in the list of sources.

An Apollo team member can comment one of the following commands to dictate which branch to attach the preview to:

  • !docs set-base-branch next
  • !docs set-base-branch main

Build ID: a87565016093485a22131f21

@github-actions
Copy link
Contributor

@abernix, please consider creating a changeset entry in /.changesets/. These instructions describe the process and tooling.

@router-perf
Copy link

router-perf bot commented Jan 20, 2025

CI performance tests

  • connectors-const - Connectors stress test that runs with a constant number of users
  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

@abernix abernix merged commit d4faa7f into dev Jan 20, 2025
@abernix abernix deleted the next branch January 20, 2025 15:02
@abernix abernix restored the next branch January 20, 2025 15:03
@abernix
Copy link
Member Author

abernix commented Jan 20, 2025

For posterity, that worked. You're welcome.

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