From 1f78b97f2ef48893004a3ffd14f25ca0b6a03b09 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Fri, 15 Oct 2021 20:15:31 +0200
Subject: [PATCH] .gitlab-ci: use new oniro/* locations
The manifest repository is now gone, with distro/oniro taking its place.
The aggregated repository is distro/oniro-readthedocs-aggregated.
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee39931..92171c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ include:
file:
- 'dco.yaml'
- 'reuse.yaml'
- - project: 'OSTC/OHOS/manifest'
+ - project: 'distro/oniro'
file: '.oniro-ci/build-generic.yaml'
dco:
@@ -68,7 +68,7 @@ deploy:
script:
- !reference [.workspace, script]
# We are in the root of the git-repo workspace.
- - git clone https://user:$OHOS_AGGREGATED_DOCS_TOKEN@git.ostc-eu.org/OSTC/infrastructure/allscenarios-readthedocs-aggregated.git aggregated
+ - git clone https://user:$OHOS_AGGREGATED_DOCS_TOKEN@git.ostc-eu.org/distro/oniro-readthedocs-aggregated.git aggregated
- find aggregated -maxdepth 1 -not -path aggregated/.git -not -path aggregated -exec rm -rvf {} \;
- tar -c --dereference -C docs --exclude ./.git --exclude ./.gitlab-ci.yml . | tar -x -C aggregated
# Commit and push back, if something changed.
@@ -76,7 +76,7 @@ deploy:
cd aggregated;
if [ -n "$(git status -s)" ]; then
msg="docs repository snapshot - $CI_COMMIT_BRANCH:$CI_COMMIT_SHA";
- git config --local user.name "All Scenario OS CI";
+ git config --local user.name "Oniro Project CI";
git config --local user.email "ci@ostc-eu.org";
git add -A;
git commit -sm "$msg";
--
GitLab