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

Set back the regular pipeline

See merge request lightspeedrtx/lightspeed-kit!687

.gitlab-ci.yml

@@ -15,7 +15,6 @@ stages:
   - publish_docs
   - build_package
   - publish_extensions
-  - trigger_publish_to_launcher
   - publish_package
   - publish_package_scheduled
   - gitlab_release

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - REMIX-2871: Remove parent prim override if there are no changed attrs
 - REMIX-3105: Simplifying texture set logic with centralized texture set logic
 - REMIX-3083: Fixed ingestion progress bar to update count when ingestion is complete
+- Set back the regular pipeline
 
 ### Fixed
 - REMIX-3078: Fixed texture preview window overlapping

tools/ci/gitlab/publishing/publish_package.yml

@@ -6,8 +6,7 @@ publish-to-launcher:
   stage: publish_package
   when: manual
   needs:
-    - pipeline: $PARENT_PIPELINE_ID
-      job: build-package-windows
+    - job: build-package-windows
       artifacts: true
   before_script:
     - !reference [ .linux_vault, before_script ]
@@ -21,6 +20,8 @@ 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"
+    - if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+    - if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
       when: manual
     - when: never