Skip to content
Snippets Groups Projects
Commit dd99ceb0 authored by Sébastien Heurtematte's avatar Sébastien Heurtematte :speech_balloon:
Browse files
parent b9c4c2e8
No related branches found
No related tags found
No related merge requests found
...@@ -104,6 +104,8 @@ reuse: ...@@ -104,6 +104,8 @@ reuse:
# that modify oniro.git in any way (e.g. a branch, a pull request or merge # that modify oniro.git in any way (e.g. a branch, a pull request or merge
# train). # train).
GIT_STRATEGY: none GIT_STRATEGY: none
CI_GITLAB_USER_ID: "oniro-core-bot"
CI_GITLAB_USER_EMAIL: "oniro-core-bot@eclipse.org"
cache: cache:
- key: - key:
prefix: repo-mirror-$CI_ONIRO_MANIFEST_MIRROR_REPO_REV prefix: repo-mirror-$CI_ONIRO_MANIFEST_MIRROR_REPO_REV
...@@ -143,8 +145,8 @@ reuse: ...@@ -143,8 +145,8 @@ reuse:
# create and send commits. # create and send commits.
- gl_section_open_collapsed setup_git "Setting up git" - gl_section_open_collapsed setup_git "Setting up git"
- git config --global --add safe.directory "$CI_PROJECT_DIR" - git config --global --add safe.directory "$CI_PROJECT_DIR"
- git config --global user.name "Oniro Core Project Bot" - git config --global user.email "$CI_GITLAB_USER_EMAIL"
- git config --global user.email "oniro-core-bot@eclipse.org" - git config --global user.name "$CI_GITLAB_USER_ID"
- gl_section_close setup_git - gl_section_close setup_git
# Since CI_PROJECT_DIR is set to 'none', GitLab runner does not perform any # Since CI_PROJECT_DIR is set to 'none', GitLab runner does not perform any
...@@ -243,12 +245,17 @@ deploy: ...@@ -243,12 +245,17 @@ deploy:
image: image:
name: docker.io/onirocore/docs-builder:latest name: docker.io/onirocore/docs-builder:latest
stage: deploy stage: deploy
variables:
CI_DOC_DEPLOY_REPO: "gitlab.eclipse.org/eclipse/oniro-core/oniro-readthedocs-aggregated.git"
CI_DOC_DEPLOY_REPO_BRANCH: "main"
CI_GITLAB_USERNAME: "oniro-core-bot"
CI_GITLAB_TOKEN: "<api token from gitlab"
script: script:
# We are in the root of the git-repo workspace. Because # We are in the root of the git-repo workspace. Because
# .oniro-repo-workspace uses GIT_STRATEGY=none, the workspace is not # .oniro-repo-workspace uses GIT_STRATEGY=none, the workspace is not
# cleaned automatically. # cleaned automatically.
- rm -rf aggregated - rm -rf aggregated
- git clone https://user:$CI_ONIRO_AGGREGATED_DOCS_TOKEN@gitlab.eclipse.org/eclipse/oniro-core/oniro-readthedocs-aggregated.git aggregated - git clone https://$CI_GITLAB_USERNAME:$CI_GITLAB_TOKEN@$CI_DOC_DEPLOY_REPO aggregated
- find aggregated -maxdepth 1 -not -path aggregated/.git -not -path aggregated -exec rm -rvf {} \; - 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 - tar -c --dereference -C docs --exclude ./.git --exclude ./.gitlab-ci.yml . | tar -x -C aggregated
# Commit and push back, if something changed. # Commit and push back, if something changed.
...@@ -258,7 +265,7 @@ deploy: ...@@ -258,7 +265,7 @@ deploy:
msg="docs repository snapshot - $CI_COMMIT_BRANCH:$CI_COMMIT_SHA"; msg="docs repository snapshot - $CI_COMMIT_BRANCH:$CI_COMMIT_SHA";
git add -A; git add -A;
git commit -sm "$msg"; git commit -sm "$msg";
git push origin HEAD:main; git push origin HEAD:$CI_DOC_DEPLOY_REPO_BRANCH;
else else
echo "Nothing new to commit."; echo "Nothing new to commit.";
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment