From d2a995195f2266bc388453ed326113aa5b23a85d Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:34:58 +0100 Subject: [PATCH 01/10] chore: test if CI runs this project's tests --- Basic/MultiplayerUseCases/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Basic/MultiplayerUseCases/test.txt diff --git a/Basic/MultiplayerUseCases/test.txt b/Basic/MultiplayerUseCases/test.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/Basic/MultiplayerUseCases/test.txt @@ -0,0 +1 @@ +test \ No newline at end of file From c4777eac2de9bb9419bf62a587f4da2c7e0a8884 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:36:35 +0100 Subject: [PATCH 02/10] test --- .../{shared_triggers.yml => _triggers.yml} | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) rename .yamato/{shared_triggers.yml => _triggers.yml} (97%) diff --git a/.yamato/shared_triggers.yml b/.yamato/_triggers.yml similarity index 97% rename from .yamato/shared_triggers.yml rename to .yamato/_triggers.yml index 655d2c792..5ee15e22c 100644 --- a/.yamato/shared_triggers.yml +++ b/.yamato/_triggers.yml @@ -1,45 +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: 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 +{% 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: 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 0f53a69297b523d220040a09ec034db385edc435 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:37:30 +0100 Subject: [PATCH 03/10] test --- .yamato/_triggers.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 5ee15e22c..df9fc51e6 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -21,9 +21,7 @@ pull_request_trigger: (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/**/*") + NOT pull_request.draft # Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch From e7a0e520b4b795035a92e0e7d2ba96432f0c06ce Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:38:49 +0100 Subject: [PATCH 04/10] revert renaming --- .yamato/{_triggers.yml => shared_triggers.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .yamato/{_triggers.yml => shared_triggers.yml} (100%) diff --git a/.yamato/_triggers.yml b/.yamato/shared_triggers.yml similarity index 100% rename from .yamato/_triggers.yml rename to .yamato/shared_triggers.yml From 2472dd1331721c072d39f33e5f19feb8e646cc96 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:39:30 +0100 Subject: [PATCH 05/10] test --- .yamato/shared_triggers.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.yamato/shared_triggers.yml b/.yamato/shared_triggers.yml index df9fc51e6..c80bc4794 100644 --- a/.yamato/shared_triggers.yml +++ b/.yamato/shared_triggers.yml @@ -17,11 +17,6 @@ pull_request_trigger: {% 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 # Run all tasks on the bitesize sample develop branch (head) when there is a push to the Netcode for GameObjects develop branch From e6fcff09a3a4c1f9faa7b3d09b4118c08967bda9 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:41:22 +0100 Subject: [PATCH 06/10] test --- .yamato/MultiplayerUseCases_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/MultiplayerUseCases_triggers.yml b/.yamato/MultiplayerUseCases_triggers.yml index 222be4eb8..d72a8f465 100644 --- a/.yamato/MultiplayerUseCases_triggers.yml +++ b/.yamato/MultiplayerUseCases_triggers.yml @@ -24,7 +24,7 @@ pull_request_trigger: pull_request.target eq "develop" OR pull_request.target match "/^sample\//") AND NOT pull_request.draft AND - pull_request.changes.any match "Basic/MultiplayerUseCases/**/*" + pull_request.changes.any match "./Basic/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: From f89a989aebe0a08689586315a47bb4c3cdf1f559 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:43:49 +0100 Subject: [PATCH 07/10] test --- .yamato/MultiplayerUseCases_triggers.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.yamato/MultiplayerUseCases_triggers.yml b/.yamato/MultiplayerUseCases_triggers.yml index d72a8f465..4bc6de736 100644 --- a/.yamato/MultiplayerUseCases_triggers.yml +++ b/.yamato/MultiplayerUseCases_triggers.yml @@ -19,12 +19,6 @@ pull_request_trigger: {% 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/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: From e663d86f5d91e8b28032ce9b914c27711b63b055 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:44:51 +0100 Subject: [PATCH 08/10] test --- .yamato/shared_triggers.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.yamato/shared_triggers.yml b/.yamato/shared_triggers.yml index c80bc4794..f1ee82f42 100644 --- a/.yamato/shared_triggers.yml +++ b/.yamato/shared_triggers.yml @@ -17,7 +17,12 @@ pull_request_trigger: {% endfor -%} triggers: cancel_old_ci: true - + pull_requests: + - targets: + only: + - "main" + - "develop" + - "/^sample\//" # 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: @@ -35,4 +40,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 + - develop \ No newline at end of file From 46fed8e565d09caec60a8bd1cd4efc4d385c0d59 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:47:01 +0100 Subject: [PATCH 09/10] test --- .yamato/{shared_triggers.yml => _triggers.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .yamato/{shared_triggers.yml => _triggers.yml} (100%) diff --git a/.yamato/shared_triggers.yml b/.yamato/_triggers.yml similarity index 100% rename from .yamato/shared_triggers.yml rename to .yamato/_triggers.yml From 7b7e1b7b3ad8a5f77de05e2d91284256adf6ebdc Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Thu, 29 Aug 2024 11:48:52 +0100 Subject: [PATCH 10/10] test --- Basic/MultiplayerUseCases/{ => Assets}/test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Basic/MultiplayerUseCases/{ => Assets}/test.txt (100%) diff --git a/Basic/MultiplayerUseCases/test.txt b/Basic/MultiplayerUseCases/Assets/test.txt similarity index 100% rename from Basic/MultiplayerUseCases/test.txt rename to Basic/MultiplayerUseCases/Assets/test.txt