From f8712416cab74a8df49518c3bc7abe8328d7fbbd Mon Sep 17 00:00:00 2001 From: harshala-rajesh Date: Mon, 8 Jul 2024 11:45:29 -0400 Subject: [PATCH 1/2] copy all changes to new branch --- .yamato/2DSpaceShooter_triggers.yml | 46 +++++++++++++++++++ ...triggers.yml => ClientDriven_triggers.yml} | 18 ++++---- .yamato/DedicatedGameServer_triggers.yml | 45 ++++++++++++++++++ .yamato/MultiplayerUseCases_triggers.yml | 45 ++++++++++++++++++ ...micaddressablesnetworkprefabs_triggers.yml | 45 ++++++++++++++++++ .yamato/shared_triggers.yml | 45 ++++++++++++++++++ 6 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 .yamato/2DSpaceShooter_triggers.yml rename .yamato/{_triggers.yml => ClientDriven_triggers.yml} (77%) create mode 100644 .yamato/DedicatedGameServer_triggers.yml create mode 100644 .yamato/MultiplayerUseCases_triggers.yml create mode 100644 .yamato/dynamicaddressablesnetworkprefabs_triggers.yml create mode 100644 .yamato/shared_triggers.yml diff --git a/.yamato/2DSpaceShooter_triggers.yml b/.yamato/2DSpaceShooter_triggers.yml new file mode 100644 index 000000000..4052216e0 --- /dev/null +++ b/.yamato/2DSpaceShooter_triggers.yml @@ -0,0 +1,46 @@ +{% metadata_file .yamato/project.metafile %} +--- + +# Run all relevant tasks when a pull request targets the develop / main or a sample branch +pull_request_trigger: + name: 2DSpaceShooter Pull Request Trigger (main, develop, & sample branches) + dependencies: +{% for project in projects -%} +{% if project.name =="2dspaceshooter" -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% if project.run_editor_tests or project.run_playmode_tests -%} # Only run tests for projects where relevant + - .yamato/tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endif -%} +{% endfor -%} +{% endfor -%} +{% endif -%} +{% endfor -%} + triggers: + cancel_old_ci: true + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + pull_request.changes.any match "Basic/2DSpaceShooter/**/*" + + +# Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch +external_ngo_develop_pull_request_trigger: + name: Netcode for GameObjects (External) Develop Branch Triggers + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + external: + source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git + expression: push.branch eq "develop" + refs_on_this_repository: + - develop diff --git a/.yamato/_triggers.yml b/.yamato/ClientDriven_triggers.yml similarity index 77% rename from .yamato/_triggers.yml rename to .yamato/ClientDriven_triggers.yml index f1ee82f42..3a5d19817 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/ClientDriven_triggers.yml @@ -3,9 +3,10 @@ # Run all relevant tasks when a pull request targets the develop / main or a sample branch pull_request_trigger: - name: Pull Request Trigger (main, develop, & sample branches) + name: ClientDriven Pull Request Trigger (main, develop, & sample branches) dependencies: {% for project in projects -%} +{% if project.name =="clientdriven" -%} {% for editor in project.test_editors -%} {% for platform in test_platforms -%} - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} @@ -14,15 +15,16 @@ pull_request_trigger: {% endif -%} {% endfor -%} {% endfor -%} +{% endif -%} {% endfor -%} triggers: cancel_old_ci: true - pull_requests: - - targets: - only: - - "main" - - "develop" - - "/^sample\//" + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + pull_request.changes.any match "Basic/ClientDriven/**/*" # Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch external_ngo_develop_pull_request_trigger: @@ -40,4 +42,4 @@ external_ngo_develop_pull_request_trigger: source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git expression: push.branch eq "develop" refs_on_this_repository: - - develop \ No newline at end of file + - develop diff --git a/.yamato/DedicatedGameServer_triggers.yml b/.yamato/DedicatedGameServer_triggers.yml new file mode 100644 index 000000000..cd149a7f4 --- /dev/null +++ b/.yamato/DedicatedGameServer_triggers.yml @@ -0,0 +1,45 @@ +{% metadata_file .yamato/project.metafile %} +--- + +# Run all relevant tasks when a pull request targets the develop / main or a sample branch +pull_request_trigger: + name: DedicatedGameServer Pull Request Trigger (main, develop, & sample branches) + dependencies: +{% for project in projects -%} +{% if project.name =="dedicatedgameserver" -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% if project.run_editor_tests or project.run_playmode_tests -%} # Only run tests for projects where relevant + - .yamato/tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endif -%} +{% endfor -%} +{% endfor -%} +{% endif -%} +{% endfor -%} + triggers: + cancel_old_ci: true + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + pull_request.changes.any match "Experimental/DedicatedGameServer/**/*" + +# Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch +external_ngo_develop_pull_request_trigger: + name: Netcode for GameObjects (External) Develop Branch Triggers + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + external: + source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git + expression: push.branch eq "develop" + refs_on_this_repository: + - develop diff --git a/.yamato/MultiplayerUseCases_triggers.yml b/.yamato/MultiplayerUseCases_triggers.yml new file mode 100644 index 000000000..bffc418d7 --- /dev/null +++ b/.yamato/MultiplayerUseCases_triggers.yml @@ -0,0 +1,45 @@ +{% metadata_file .yamato/project.metafile %} +--- + +# Run all relevant tasks when a pull request targets the develop / main or a sample branch +pull_request_trigger: + name: MultiplayerUseCases Pull Request Trigger (main, develop, & sample branches) + dependencies: +{% for project in projects -%} +{% if project.name =="multiplayerusecases" -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% if project.run_editor_tests or project.run_playmode_tests -%} # Only run tests for projects where relevant + - .yamato/tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endif -%} +{% endfor -%} +{% endfor -%} +{% endif -%} +{% endfor -%} + triggers: + cancel_old_ci: true + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + pull_request.changes.any match "Experimental/MultiplayerUseCases/**/*" + +# Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch +external_ngo_develop_pull_request_trigger: + name: Netcode for GameObjects (External) Develop Branch Triggers + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + external: + source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git + expression: push.branch eq "develop" + refs_on_this_repository: + - develop diff --git a/.yamato/dynamicaddressablesnetworkprefabs_triggers.yml b/.yamato/dynamicaddressablesnetworkprefabs_triggers.yml new file mode 100644 index 000000000..b9295abb8 --- /dev/null +++ b/.yamato/dynamicaddressablesnetworkprefabs_triggers.yml @@ -0,0 +1,45 @@ +{% metadata_file .yamato/project.metafile %} +--- + +# Run all relevant tasks when a pull request targets the develop / main or a sample branch +pull_request_trigger: + name: DynamicAddressablesNetworkPrefabs Pull Request Trigger (main, develop, & sample branches) + dependencies: +{% for project in projects -%} +{% if project.name =="dynamicaddressablesnetworkprefabs" -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% if project.run_editor_tests or project.run_playmode_tests -%} # Only run tests for projects where relevant + - .yamato/tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endif -%} +{% endfor -%} +{% endfor -%} +{% endif -%} +{% endfor -%} + triggers: + cancel_old_ci: true + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + pull_request.changes.any match "Basic/DynamicAddressablesNetworkPrefabs/**/*" + +# Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch +external_ngo_develop_pull_request_trigger: + name: Netcode for GameObjects (External) Develop Branch Triggers + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + external: + source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git + expression: push.branch eq "develop" + refs_on_this_repository: + - develop diff --git a/.yamato/shared_triggers.yml b/.yamato/shared_triggers.yml new file mode 100644 index 000000000..988a34aee --- /dev/null +++ b/.yamato/shared_triggers.yml @@ -0,0 +1,45 @@ +{% metadata_file .yamato/project.metafile %} +--- + +# Run all relevant tasks when a pull request targets the develop / main or a sample branch +pull_request_trigger: + name: Shared Pull Request Trigger (main, develop, & sample branches) + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% if project.run_editor_tests or project.run_playmode_tests -%} # Only run tests for projects where relevant + - .yamato/tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endif -%} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + cancel_old_ci: true + expression: |- + (pull_request.target eq "main" OR + pull_request.target eq "develop" OR + pull_request.target match "/^sample\//") AND + NOT pull_request.draft AND + (NOT pull_request.changes.any match "Basic/**/*" AND + NOT pull_request.changes.any match "Experimental/**/*") + + +# Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch +external_ngo_develop_pull_request_trigger: + name: Netcode for GameObjects (External) Develop Branch Triggers + dependencies: +{% for project in projects -%} +{% for editor in project.test_editors -%} +{% for platform in test_platforms -%} + - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }} +{% endfor -%} +{% endfor -%} +{% endfor -%} + triggers: + external: + source: git@github.com/Unity-Technologies/com.unity.netcode.gameobjects.git + expression: push.branch eq "develop" + refs_on_this_repository: + - develop From aa0043c77064214f4ab26c9db526d98f8d9487d6 Mon Sep 17 00:00:00 2001 From: harshala-rajesh Date: Tue, 9 Jul 2024 10:10:14 -0400 Subject: [PATCH 2/2] changing name of shared triggers --- .yamato/shared_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/shared_triggers.yml b/.yamato/shared_triggers.yml index 988a34aee..655d2c792 100644 --- a/.yamato/shared_triggers.yml +++ b/.yamato/shared_triggers.yml @@ -3,7 +3,7 @@ # Run all relevant tasks when a pull request targets the develop / main or a sample branch pull_request_trigger: - name: Shared Pull Request Trigger (main, develop, & sample branches) + name: Pull Request Trigger (main, develop, & sample branches) dependencies: {% for project in projects -%} {% for editor in project.test_editors -%}