Skip to content

Commit

Permalink
Merge branch 'dev/dbataille/ci_2024.4.x' into 'release/2024.4.x'
Browse files Browse the repository at this point in the history
Change branch to release branch for CI for RC

See merge request lightspeedrtx/lightspeed-kit!696
  • Loading branch information
nvdamien committed Jul 19, 2024
2 parents 316b8b8 + bcb55b8 commit 61c0cae
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Create 2024.4.0-RC.2 build

### Changed
- Change branch to release branch for CI for RC

### Fixed

Expand Down
8 changes: 4 additions & 4 deletions tools/ci/gitlab/build/build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ build-package-windows:
paths:
- _build/packages
rules: ## Automatically run publish job only on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "push"
when: always
- when: never

Expand All @@ -36,8 +36,8 @@ build-package-linux:
paths:
- _build/packages
rules: ## Automatically run publish job only on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "push"
when: always
- when: never
2 changes: 1 addition & 1 deletion tools/ci/gitlab/defaults/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
variables:
GIT_STRATEGY: fetch
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "release/2024.4.x"
4 changes: 2 additions & 2 deletions tools/ci/gitlab/docs/publish_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ publish-docs:
- ./build_docs.sh
- ./build_docs.sh --publish-as-latest -s publish --edition s3web
rules: ## Automatically run publish job only on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "push"
when: always
- when: never
8 changes: 4 additions & 4 deletions tools/ci/gitlab/publishing/publish_extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ publish-extensions-windows:
variables:
GIT_STRATEGY: fetch
rules: ## Automatically run publish job only on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "push"
when: always
- when: never

Expand Down Expand Up @@ -54,8 +54,8 @@ publish-extensions-linux:
variables:
GIT_STRATEGY: fetch
rules: ## Automatically run publish job only on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- if: $CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE == "push"
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $CI_PIPELINE_SOURCE == "push"
when: always
- when: never
4 changes: 2 additions & 2 deletions tools/ci/gitlab/publishing/publish_package_scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ build-package-scheduled:
extends: build-package-windows
stage: publish_package_scheduled
rules: ## Add manual job on merge commit to main
- if: $CI_COMMIT_REF_NAME == "main" && $DO_PACKMAN_PUBLISH
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $DO_PACKMAN_PUBLISH
when: always

publish-package-scheduled:
Expand All @@ -25,5 +25,5 @@ publish-package-scheduled:
- 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" && $DO_PACKMAN_PUBLISH
- if: $CI_COMMIT_REF_NAME == "release/2024.4.x" && $DO_PACKMAN_PUBLISH
when: always

0 comments on commit 61c0cae

Please sign in to comment.