Merge branch 'dev/dbataille/fix_artefact2' into 'main'

Add a trigger pipeline to publish in the launcher

See merge request lightspeedrtx/lightspeed-kit!685

.gitlab-ci.yml

@@ -51,6 +51,7 @@ include:
   - local: tools/ci/gitlab/defaults/gitlab_release.yml
   - local: tools/ci/gitlab/defaults/agents/gpu_agent.yml
   - local: tools/ci/gitlab/defaults/agents/linux_agent.yml
+  - local: tools/ci/gitlab/defaults/agents/windows_agent.yml
   - local: tools/ci/gitlab/defaults/vault/linux_vault.yml
   - local: tools/ci/gitlab/defaults/vault/windows_vault.yml
   # Vault definitions

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed the USDC_USE_PREAD environment variable since it causes crashes for projects with many textures
 - REMIX-2825: Updated renderer to the latest dxvk-remix to accomodate USD distant light import/export fixes
 - Fixed highlight outline rendering if selecting non-power-of-two amount of objects
+- Fix trigger pipeline
 
 ### Removed
 - REMIX-3152: Removed the delete and duplicate button icons for asset reference light items in the selection tree

tools/ci/gitlab/build/build_package.yml

@@ -1,5 +1,7 @@
 build-package-windows:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: build_package
   before_script:
     - .\build.bat --rebuild --release

tools/ci/gitlab/checks/check_changelog.yml

@@ -1,5 +1,7 @@
 check-changelog:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: check_mr
   script:
     - .\repo.bat check_changelog -s "$CI_COMMIT_SHA" -t "$CI_MERGE_REQUEST_DIFF_BASE_SHA"

tools/ci/gitlab/checks/check_forbidden_words.yml

@@ -1,5 +1,7 @@
 check-forbidden-words:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: check_mr
   script:
     - .\repo.bat check_forbidden_words

tools/ci/gitlab/checks/check_format.yml

@@ -1,5 +1,7 @@
 check-format:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: check_format
   needs:
     - check-changelog

tools/ci/gitlab/checks/check_lint.yml

@@ -1,5 +1,7 @@
 check-lint:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: check_lint
   needs:
     - check-format

tools/ci/gitlab/checks/check_test_location.yml

@@ -1,5 +1,7 @@
 check-test-location:
-  extends: .defaults
+  extends:
+    - .defaults
+    - .windows_agent
   stage: check_mr
   script:
     - .\repo.bat check_test_file_location

tools/ci/gitlab/defaults/agents/windows_agent.yml

@@ -0,0 +1,3 @@
+.windows_agent:
+  tags:
+    - windows

tools/ci/gitlab/publishing/publish_package.yml

@@ -21,8 +21,6 @@ publish-to-launcher:
     - echo "WinRel=${fail_wr}"
     - '[ "$fail_wr" -eq 0 ] || exit 1'
   rules: ## Add manual job on merge commit to main
-    - if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: manual
-    - if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_COMMIT_REF_NAME == "main"
       when: manual
     - when: never

tools/ci/gitlab/tests/e2e/e2e_tests_windows.yml

@@ -3,6 +3,7 @@
     - .defaults
     - .gpu_agent
     - .windows_vault
+    - .windows_agent
   needs:
     - check-lint
   before_script:

tools/ci/gitlab/tests/unit/unit_tests_windows.yml

@@ -3,6 +3,7 @@
     - .defaults
     - .gpu_agent
     - .windows_vault
+    - .windows_agent
   needs:
     - check-lint
   before_script:

tools/ci/gitlab/trigger/trigger_publish_to_launcher.yml

@@ -1,7 +1,7 @@
 trigger-publish-to-launcher:
   stage: trigger_publish_to_launcher
   extends:
-    - .defaults
+    - .windows_agent
   needs:
     - build-package-windows
   variables: