sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 07:21:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): Explicitly set RELEASE_BRANCH (to main) for scan and release steps

Browse Source
This commit is contained in:
Thorsten Roßner
2024-11-25 12:53:34 +01:00
parent 1213ecc425
commit e5ad0bb2e0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@@ -47,6 +47,7 @@ stages:
- ".post" - ".post"
variables: variables:
RELEASE_BRANCH: "main"
NAMESPACE: NAMESPACE:
description: "The name of namespaces to deploy to." description: "The name of namespaces to deploy to."
value: "" value: ""
@@ -489,7 +490,7 @@ avscan-prepare:
rules: rules:
- if: > - if: >
$JOB_AVSCAN_ENABLED != 'false' && $JOB_AVSCAN_ENABLED != 'false' &&
$CI_COMMIT_BRANCH == 'main' && $CI_COMMIT_BRANCH == $RELEASE_BRANCH &&
$CI_PIPELINE_SOURCE =~ "push|merge_request_event" $CI_PIPELINE_SOURCE =~ "push|merge_request_event"
when: "always" when: "always"
- when: "never" - when: "never"
@@ -539,7 +540,7 @@ avscan-start:
rules: rules:
- if: > - if: >
$JOB_AVSCAN_ENABLED != 'false' && $JOB_AVSCAN_ENABLED != 'false' &&
$CI_COMMIT_BRANCH == 'main' && $CI_COMMIT_BRANCH == $RELEASE_BRANCH &&
$CI_PIPELINE_SOURCE =~ "push|merge_request_event" $CI_PIPELINE_SOURCE =~ "push|merge_request_event"
when: "always" when: "always"
- when: "never" - when: "never"
@@ -585,7 +586,7 @@ generate-release-version:
rules: rules:
- if: > - if: >
$JOB_RELEASE_ENABLED != 'false' && $JOB_RELEASE_ENABLED != 'false' &&
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH == $RELEASE_BRANCH &&
$CI_PIPELINE_SOURCE =~ "push|merge_request_event" $CI_PIPELINE_SOURCE =~ "push|merge_request_event"
when: "on_success" when: "on_success"
@@ -593,7 +594,7 @@ release:
rules: rules:
- if: > - if: >
$JOB_AVSCAN_ENABLED != 'false' && $JOB_AVSCAN_ENABLED != 'false' &&
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH == $RELEASE_BRANCH &&
$CI_PIPELINE_SOURCE =~ "push|merge_request_event" $CI_PIPELINE_SOURCE =~ "push|merge_request_event"
when: "on_success" when: "on_success"
script: script:
@@ -621,7 +622,7 @@ release:
- | - |
cat << 'EOF' > ${CI_PROJECT_DIR}/.releaserc cat << 'EOF' > ${CI_PROJECT_DIR}/.releaserc
{ {
"branches": ["main"], "branches": ["${RELEASE_BRANCH}"],
"plugins": [ "plugins": [
"@semantic-release/gitlab", "@semantic-release/gitlab",
"@semantic-release/release-notes-generator", "@semantic-release/release-notes-generator",

2
.gitlab/generate/generate-docs.yml
View File

@@ -13,7 +13,7 @@ generate-docs:
extends: ".generate-common" extends: ".generate-common"
image: "${OPENDESK_CI_CLI_IMAGE}" image: "${OPENDESK_CI_CLI_IMAGE}"
rules: rules:
- if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" - if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $RELEASE_BRANCH"
when: "on_success" when: "on_success"
script: script:
- "node /app/src/index.js generate-docs -d ${CI_PROJECT_DIR}" - "node /app/src/index.js generate-docs -d ${CI_PROJECT_DIR}"