From d6c41879cb923f39c36158247db63bf56a9b825b Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Wed, 13 Sep 2023 15:42:27 +0300
Subject: [PATCH] add: added release step for tagging
---
cicd/gitlab/gitlab-ci.yml | 6 +-----
cicd/gitlab/stages/build.yml | 1 -
cicd/gitlab/stages/deploy.yml | 9 ---------
cicd/gitlab/stages/release.yml | 27 +++++++++++++++++++++++----
4 files changed, 24 insertions(+), 19 deletions(-)
delete mode 100644 cicd/gitlab/stages/deploy.yml
diff --git a/cicd/gitlab/gitlab-ci.yml b/cicd/gitlab/gitlab-ci.yml
index 86c2982..30b4c8e 100644
--- a/cicd/gitlab/gitlab-ci.yml
+++ b/cicd/gitlab/gitlab-ci.yml
@@ -16,11 +16,7 @@ variables:
- 3.1.14
description: "Emscripten SDK version"
DEBIAN_FRONTEND: non-interactive
- QDS_CI_PACKAGE_NAME: "qtdvs-${QDS_CI_BUILD_QT_VERSION}"
- QDS_CI_CACHE_KEY_BUILD: "cache-build-${CI_PIPELINE_ID}"
- QDS_CI_CACHE_KEY_PROD: "cache-prod-${CI_PIPELINE_ID}"
- QDS_CI_CACHE_PATH_BUILD: "${CI_PROJECT_DIR}/outdir/build"
- QDS_CI_CACHE_PATH_PROD: "${CI_PROJECT_DIR}/outdir/prod"
+ QDS_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/outdir/artifacts"
GIT_SUBMODULE_STRATEGY: recursive
stages:
diff --git a/cicd/gitlab/stages/build.yml b/cicd/gitlab/stages/build.yml
index d4e51cd..1430096 100644
--- a/cicd/gitlab/stages/build.yml
+++ b/cicd/gitlab/stages/build.yml
@@ -6,7 +6,6 @@
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
variables:
QDS_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
- QDS_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/outdir/artifacts"
artifacts:
name: design-viewer-${QDS_CI_OS}-${CI_JOB_ID}
expose_as: "build-artifacts"
diff --git a/cicd/gitlab/stages/deploy.yml b/cicd/gitlab/stages/deploy.yml
deleted file mode 100644
index a906a70..0000000
--- a/cicd/gitlab/stages/deploy.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-deploy-android:
- stage: deploy
- image: "alpine:latest"
- tags:
- - linux-blade
- rules:
- - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
- script:
- - echo "Deploying to Android"
diff --git a/cicd/gitlab/stages/release.yml b/cicd/gitlab/stages/release.yml
index 4175bc3..8320de4 100644
--- a/cicd/gitlab/stages/release.yml
+++ b/cicd/gitlab/stages/release.yml
@@ -1,9 +1,28 @@
-release-android:
+.release-common:
stage: release
- image: "alpine:latest"
tags:
- linux-blade
rules:
- - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
+ - if: $CI_COMMIT_TAG
+ release:
+ name: ${QDS_RELEASE_NAME}
+ description: ${QDS_RELEASE_DESCRIPTION}
+ tag_name: '$CI_COMMIT_TAG'
+
+release-android:
+ extends: .release-common
+ variables:
+ QDS_RELEASE_NAME: "Design Viewer Android - ${CI_COMMIT_TAG}"
+ QDS_RELEASE_DESCRIPTION: "This version is built on ${QDS_CI_BUILD_QT_VERSION_ANDROID}"
+ image: "alpine:latest"
+ script:
+ - echo "Releasing Design Viewer Android application"
+
+release-wasm-singlethread:
+ extends: .release-common
+ variables:
+ QDS_RELEASE_NAME: "Design Viewer WASM - ${CI_COMMIT_TAG}"
+ QDS_RELEASE_DESCRIPTION: "This version is built on ${QDS_CI_BUILD_QT_VERSION_WASM}"
+ image: "alpine:latest"
script:
- - echo "Releasing Android artifacts"
+ - echo "Releasing Design Viewer WebAssembly application"
--
GitLab