From 4a58ff368ab4e52122449e00f66504d5523901f1 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 23 Aug 2022 21:25:02 +0200
Subject: [PATCH] Use right Gitlab CI var for Cypress branch name
---
.gitlab-ci.yml | 2 +-
CHANGELOG.md | 4 ++++
Chart.yaml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 533ac9b6..03c5e22e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ install-helmrelease:
- sed -i "s/office-cert/office-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml
- |
echo -e "tests:\n cypress:\n projectId: $CYPRESS_PROJECT_ID\n recordKey: $CYPRESS_RECORD_KEY" >> values-ci.yaml
- echo -e " commitInfo:\n branch: $CI_COMMIT_BRANCH\n message: $CI_COMMIT_TITLE\n author: $CI_COMMIT_AUTHOR\n sha: $CI_COMMIT_SHORT_SHA" >> values-ci.yaml
+ echo -e " commitInfo:\n branch: $CI_COMMIT_REF_NAME\n message: $CI_COMMIT_TITLE\n author: $CI_COMMIT_AUTHOR\n sha: $CI_COMMIT_SHORT_SHA" >> values-ci.yaml
- cat values-ci.yaml
- time kubectl delete namespace "nc$CI_MERGE_REQUEST_IID" || true
- time helm install --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f32e5058..6b0df82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.10.21] - 2022-08-23
+
+* Use right Gitlab CI var for Cypress branch name
+
## [0.10.20] - 2022-08-23
* Fix install error with multi-line commit message
diff --git a/Chart.yaml b/Chart.yaml
index 9b006aa4..5399c6dd 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
description: |
A helm chart for installing NextCloud and setting up ONLYOFFICE integration
name: nextcloud-onlyoffice
-version: 0.10.20
+version: 0.10.21
appVersion: NC-24.0.2-OO-7.1.1.23
icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
dependencies:
--
GitLab