Skip to content

Commit

Permalink
Merge branch 'dev/dbataille/move_ci_publish_launcher' into 'main'
Browse files Browse the repository at this point in the history
Do the publish to the launcher at the same time that the gitlab release

See merge request lightspeedrtx/lightspeed-kit!693
  • Loading branch information
nvdamien committed Jul 19, 2024
2 parents ecc03c9 + 6a98ac9 commit d22858f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- REMIX-3083: Fixed ingestion progress bar to update count when ingestion is complete
- Set back the regular pipeline
- REMIX-2880: Remove unused libs
- Move the job "publish in the launcher" into the Gitlab publish pipeline

### Fixed
- REMIX-3078: Fixed texture preview window overlapping
Expand Down
14 changes: 4 additions & 10 deletions tools/ci/gitlab/publishing/publish_package.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
publish-to-launcher:
extends:
- .defaults
- .linux_agent
- .linux_vault
stage: publish_package
when: manual
- .gitlab_release
needs:
- job: build-package-windows
- job: build-package-gitlab-linux
artifacts: true
- job: build-package-gitlab-windows
artifacts: true
before_script:
- !reference [ .linux_vault, before_script ]
Expand All @@ -19,9 +19,3 @@ publish-to-launcher:
- ./repo.sh ci publish_to_launcher || fail_wr=1
- 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"
when: manual
- when: never

0 comments on commit d22858f

Please sign in to comment.