diff --git a/.github/workflows/only-rc-into-main.yml b/.github/workflows/only-rc-into-main.yml new file mode 100644 index 0000000..69e19ca --- /dev/null +++ b/.github/workflows/only-rc-into-main.yml @@ -0,0 +1,11 @@ +name: Only rc into main + +# A pull request into the default branch must come from rc. See +# 51Degrees/common-ci .github/workflows/only-rc-into-main.yml. +on: + pull_request: + +jobs: + rc: + name: Only rc into main + uses: 51Degrees/common-ci/.github/workflows/only-rc-into-main.yml@main diff --git a/Browser51Did/Demo.cs b/Browser51Did/Demo.cs index 82e5bec..311bbe0 100644 --- a/Browser51Did/Demo.cs +++ b/Browser51Did/Demo.cs @@ -11,7 +11,7 @@ namespace FiftyOne.Pipeline.Cloud.SeleniumTests.Browser51Did; /// /// The routes every language's demo serves, as the dotnet demo in -/// device-detection-dotnet-examples defines them. A test names the page it +/// 51degrees-dotnet defines them. A test names the page it /// loads by one of these and nothing else, so the same test drives any /// demo that serves the same pages. /// diff --git a/Browser51Did/README.md b/Browser51Did/README.md index 7245f65..e432aca 100644 --- a/Browser51Did/README.md +++ b/Browser51Did/README.md @@ -12,8 +12,8 @@ resource key cannot reach a test report, and three, in is read from. They drive a **demo**, a small web app that serves every page the tests -load. The dotnet demo is `Examples/Cloud/pmp-web` in -[device-detection-dotnet-examples](https://github.com/51Degrees/device-detection-dotnet-examples). +load. The dotnet demo is `examples/device-detection/Cloud/pmp-web` in +[51degrees-dotnet](https://github.com/51Degrees/51degrees-dotnet). The pages, the recorder that watches them, the change watcher and the stub consent platform are plain static files in that demo, so a demo in another language copies them, fills the same placeholders, and these same tests then diff --git a/Examples/ExampleApps.cs b/Examples/ExampleApps.cs index fe7b8df..4f6414c 100644 --- a/Examples/ExampleApps.cs +++ b/Examples/ExampleApps.cs @@ -145,8 +145,8 @@ public static bool TryCreateDemo( Lang: "dotnet", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-dotnet-examples", - "Examples", "Cloud", "pmp-web"), + "51degrees-dotnet", "examples", "device-detection", + "Cloud", "pmp-web"), Command: "dotnet", Args: new[] { "run", "-c", "Release", "--no-launch-profile" }, ReadinessPath: "/cloud/common", @@ -211,8 +211,8 @@ public static ExampleAppOptions BuildOptions( Lang: "dotnet", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-dotnet-examples", - "Examples", "Cloud", "GettingStarted-Web"), + "51degrees-dotnet", "examples", "device-detection", + "Cloud", "GettingStarted-Web"), Command: "dotnet", Args: new[] { "run", "-c", "Release", "--no-launch-profile" }, ReadinessPath: "/", @@ -230,7 +230,7 @@ public static ExampleAppOptions BuildOptions( Lang: "java", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-java-examples"), + "51degrees-java", "examples", "device-detection"), Command: "java", Args: new[] { "-jar" }, ReadinessPath: "/", @@ -253,7 +253,7 @@ public static ExampleAppOptions BuildOptions( Lang: "node", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-node", + "51degrees-node", "device-detection", "fiftyone.devicedetection.cloud", "examples", "cloud", "gettingstarted-web"), Command: "node", @@ -269,20 +269,25 @@ public static ExampleAppOptions BuildOptions( ["RESOURCE_KEY"] = o.ResourceKey, }, BuildCommand: "npm", - // package.json lives one level up from examples/cloud/gettingstarted-web - BuildArgs: new[] { "install", "--prefix", "../../.." }, + // package.json lives one level up from examples/cloud/gettingstarted-web. + // The pipeline packages are taken from the monorepo, so its + // pipeline/fiftyone.pipeline.core/javascript-templates submodule + // must be checked out before this runs. --install-links copies + // them in with their own dependencies; a symlink would resolve + // those from the monorepo, where nothing is installed. + BuildArgs: new[] { "install", "--install-links", "--prefix", "../../.." }, BuildTimeoutSeconds: 300, JsonEndpointPath: "/json"), ["python"] = new ExampleDescriptor( Lang: "python", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-python", + "51degrees-python", "device-detection", "fiftyone_devicedetection_examples"), // the venv's python (absolute path) Command: VenvPython(Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-python", + "51degrees-python", "device-detection", "fiftyone_devicedetection_examples", ".venv")), Args: new[] { "-m", "fiftyone_devicedetection_examples.cloud.gettingstarted_web" }, @@ -311,7 +316,7 @@ public static ExampleAppOptions BuildOptions( Lang: "php", WorkingDir: Path.Combine( RepoPaths.SiblingsRoot, - "device-detection-php", "examples"), + "51degrees-php", "device-detection", "cloud", "examples"), Command: "bash", // clear the cached pipeline so the endpoint override takes effect Args: new[]