From b39053cd876ebff1b41deea32e5eadec29744aab Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Thu, 4 Aug 2022 14:46:29 +0000 Subject: [PATCH 1/5] cassini-doc: Add link to gitlab.arm.com contribution guide Add link to generic gitlab.arm.com contribution guide which describes how to request access. Also tightens language regarding workflows (the project only supports forking workflow - it is not just a suggestion). Signed-off-by: Adam Johnston --- documentation/contributing.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/contributing.rst b/documentation/contributing.rst index 7585c34..008a3e8 100644 --- a/documentation/contributing.rst +++ b/documentation/contributing.rst @@ -33,8 +33,9 @@ for users to understand and review licenses. Contributing to Cassini distribution ************************************ -We strongly recommend `gitlab forking workflow `_ -to contribute to this project. +This project uses the GitLab `project forking workflow `_. +By default, accounts on `gitlab.arm.com `_ do not have rights to create personal repositories and therefore fork existing projects. +In order to contribute, users must first request access as described `here `_. Every commit must have at least one ``Signed-off-by:`` line from the committer to certify that the contribution is made under the terms of the -- GitLab From 2c0d14c8c8814756181e1c5fb4bc037a28a46ee5 Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Thu, 4 Aug 2022 14:48:25 +0000 Subject: [PATCH 2/5] cassini-doc: Fix typos in commit guidelines Signed-off-by: Adam Johnston --- documentation/contributing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/contributing.rst b/documentation/contributing.rst index 008a3e8..7a31dfb 100644 --- a/documentation/contributing.rst +++ b/documentation/contributing.rst @@ -95,7 +95,7 @@ Commit guidelines Commits and patches added should follow the `OpenEmbedded patch guidelines `_. The component being changed in the shortlog should be prefixed with the -layer nam (wihtout meta-), for example: +layer name (without meta-), for example: cassini-config: Decrease frobbing level -- GitLab From 4f19068eca630e655680e85cc5440279f402878f Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Mon, 15 Aug 2022 11:16:18 +0000 Subject: [PATCH 3/5] ci: Update to latest template jobs Signed-off-by: Drew Reed --- .gitlab-ci.yml | 2 +- .gitlab/ci/trigger-image-builds.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c3faa9..66fe398 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ variables: # include jobs include: - project: $PIPELINE_TEMPLATE_PROJECT - ref: v0.0.7 + ref: v0.0.8 file: - gitlab-ci/common_gitlab-ci.yml - gitlab-ci/docker-image-base_gitlab-ci.yml diff --git a/.gitlab/ci/trigger-image-builds.yml b/.gitlab/ci/trigger-image-builds.yml index 3e08200..71e0f9f 100644 --- a/.gitlab/ci/trigger-image-builds.yml +++ b/.gitlab/ci/trigger-image-builds.yml @@ -33,7 +33,7 @@ merge_jobs: cat << EOF > ${CI_JOB_FILE} include: - project: $PIPELINE_TEMPLATE_PROJECT - ref: v0.0.7 + ref: v0.0.8 file: - gitlab-ci/common_gitlab-ci.yml - gitlab-ci/lava-test-base_gitlab-ci.yml -- GitLab From 8c930efd527530518c31b0db1d2ca37709f3cf6c Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Mon, 15 Aug 2022 11:28:48 +0000 Subject: [PATCH 4/5] Add changelog for version 0.9.0 Signed-off-by: Drew Reed --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0306bcd..0f9674d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.0 (2022-08-15) + +No changes. + ## 0.0.1 (2022-07-01) No changes. -- GitLab From 8990cc3b1d5b5e3f0b6ff4d309214bddf72d0d03 Mon Sep 17 00:00:00 2001 From: Devaraj Ranganna Date: Tue, 23 Aug 2022 10:23:35 +0000 Subject: [PATCH 5/5] cassini-ci: Update Gitlab CI variable `RELEASE_BRANCH` The value of variable `RELEASE_BRANCH` is changed to `release-branch` so that release won't happen on either `kirkstone-dev` or `main` branch. Signed-off-by: Devaraj Ranganna --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66fe398..8050cce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: description: How frequently is this build run (adhoc, nightly, weekly) # Set the branch used for making releases - RELEASE_BRANCH: kirkstone-dev + RELEASE_BRANCH: release-branch # Version variables specify where the projects version number can be found VERSION_FILE: meta-cassini-config/kas/include/cassini-release.yml VERSION_VARIABLE: .env.CASSINI_VERSION -- GitLab