Skip to content

Check that only rc merges into the default branch - #19

Merged
jwrosewell merged 1 commit into
rcfrom
feature/only-rc-into-main
Nov 3, 2026
Merged

jwrosewell merged 1 commit into
rcfrom
feature/only-rc-into-main

Conversation

@jwrosewell

Copy link
Copy Markdown
Contributor

Adds the check that only rc merges into this repository's default branch. It calls common-ci's shared workflow (common-ci#294) on every pull request. A pull request into the default branch fails unless its head is this repository's rc, and any other pull request passes.

The check is "Only rc into main / check", the same in every 51Degrees public repository, so one organisation ruleset can require it on each default branch.

It uses the workflow from common-ci's main, so it cannot start until common-ci#294 has reached common-ci's main. Until then this pull request's own check fails to start, which is expected. Merge it into rc after that.

@jwrosewell
jwrosewell marked this pull request as ready for review November 3, 2026 18:43
@jwrosewell
jwrosewell merged commit 2eaaedf into rc Nov 3, 2026
4 checks passed
@jwrosewell jwrosewell mentioned this pull request Nov 3, 2026
jwrosewell added a commit that referenced this pull request Nov 4, 2026
* Find the Java example in 51degrees-java (#16)

* Find the dotnet example in 51degrees-dotnet (#17)

device-detection-dotnet-examples has moved into 51degrees-dotnet, under
examples/device-detection. Both dotnet demos, pmp-web and GettingStarted-Web,
are found there as siblings, and the docs name the monorepo.

* Find the Node example in 51degrees-node (#18)

* Find the Node example in 51degrees-node

* Copy the monorepo packages in when installing the Node example

* Check that only rc merges into the default branch (#19)

* Find the Python example in 51degrees-python (#20)

* Find the PHP example in 51degrees-php (#21)

---------

Co-authored-by: ben51degrees <ben@51degrees.com>
Co-authored-by: Jamesr51d <122470673+Jamesr51d@users.noreply.github.com>
Co-authored-by: Eugene Dorfman <justadreamer2007@gmail.com>
@jwrosewell jwrosewell mentioned this pull request Nov 10, 2026
jwrosewell added a commit that referenced this pull request Nov 10, 2026
* Find the Java example in 51degrees-java (#16)

* Find the dotnet example in 51degrees-dotnet (#17)

device-detection-dotnet-examples has moved into 51degrees-dotnet, under
examples/device-detection. Both dotnet demos, pmp-web and GettingStarted-Web,
are found there as siblings, and the docs name the monorepo.

* Find the Node example in 51degrees-node (#18)

* Find the Node example in 51degrees-node

* Copy the monorepo packages in when installing the Node example

* Check that only rc merges into the default branch (#19)

* Find the Python example in 51degrees-python (#20)

* Find the PHP example in 51degrees-php (#21)

* Java uses the default JSON endpoint and still accepts the old one (#23)

* Let Java use the default JSON endpoint and still accept its old one

* Say once which JSON path each language uses

---------

Co-authored-by: ben51degrees <ben@51degrees.com>
Co-authored-by: Jamesr51d <122470673+Jamesr51d@users.noreply.github.com>
Co-authored-by: Eugene Dorfman <justadreamer2007@gmail.com>
jwrosewell added a commit that referenced this pull request Nov 11, 2026
* Find the Java example in 51degrees-java (#16)

* Find the dotnet example in 51degrees-dotnet (#17)

device-detection-dotnet-examples has moved into 51degrees-dotnet, under
examples/device-detection. Both dotnet demos, pmp-web and GettingStarted-Web,
are found there as siblings, and the docs name the monorepo.

* Find the Node example in 51degrees-node (#18)

* Find the Node example in 51degrees-node

* Copy the monorepo packages in when installing the Node example

* Check that only rc merges into the default branch (#19)

* Find the Python example in 51degrees-python (#20)

* Find the PHP example in 51degrees-php (#21)

* Java uses the default JSON endpoint and still accepts the old one (#23)

* Let Java use the default JSON endpoint and still accept its old one

* Say once which JSON path each language uses

* Give the .NET example the _51DEGREES_ variable names alongside the old ones (#25)

* Test that the .NET example is given the underscore variable names

The .NET cloud web example reads the resource key from
_51DEGREES_RESOURCE_KEY and the cloud endpoint from
_51DEGREES_CLOUD_ENDPOINT, with no other name, once its rename is
released.

* Give the .NET example the _51DEGREES_ variable names

The .NET cloud web example now reads the resource key from
_51DEGREES_RESOURCE_KEY and the endpoint from _51DEGREES_CLOUD_ENDPOINT,
with no other name. Released versions of it read SUPER_RESOURCE_KEY and
FIFTYONE_CLOUD_ENDPOINT, so the harness sets both pairs until every
language has released with the new names.

---------

Co-authored-by: ben51degrees <ben@51degrees.com>
Co-authored-by: Jamesr51d <122470673+Jamesr51d@users.noreply.github.com>
Co-authored-by: Eugene Dorfman <justadreamer2007@gmail.com>
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.

1 participant