From f5416d5d5e0667c8713d189f582e55865eb0146d Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 30 Mar 2022 18:04:23 +0200 Subject: [PATCH] Switch links to Eclipse for all migrated repos Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- .gitlab-ci.yml | 2 +- README.md | 2 +- building-project-documentation.rst | 2 +- ci/docs.rst | 6 +++--- ci/index.rst | 2 +- ci/oniro.rst | 2 +- contributing/gitlab.rst | 4 ++-- releases/jasmine/1.0.0/release_notes.rst | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe707c3..f326aa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ deploy: if [ -n "$(git status -s)" ]; then msg="docs repository snapshot - $CI_COMMIT_BRANCH:$CI_COMMIT_SHA"; git config --local user.name "Oniro Project CI"; - git config --local user.email "ci@booting.oniroproject.org"; + git config --local user.email "ci@oniroproject.org"; git add -A; git commit -sm "$msg"; git push origin HEAD:main; diff --git a/README.md b/README.md index 4ad1afa..ec99bd7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Read The Docs project. You can inspect the `latest` version As per the current implementation for satisfying aggregation of multiple `sphinx` projects, the repository takes advantage of symlinks which assume a -workspace set up from [the oniro repository](https://booting.oniroproject.org/distro/oniro/). +workspace set up from [the oniro repository](https://gitlab.eclipse.org/eclipse/oniro-core/oniro). Once that is initialized and synced, one can build/validate the documentation by simply running: diff --git a/building-project-documentation.rst b/building-project-documentation.rst index 3d6c2ec..9224fd0 100644 --- a/building-project-documentation.rst +++ b/building-project-documentation.rst @@ -9,7 +9,7 @@ Building |main_project_name| Documentation This topic outlines the standard way of generating the |main_project_name| project documentation locally using the source files available in the -`booting.oniroproject.org <https://booting.oniroproject.org/distro/docs>`__ repository which +`gitlab.eclipse.org <https://gitlab.eclipse.org/eclipse/oniro-core/docs>`__ repository which aggregates documentation from multiple other components. Overview diff --git a/ci/docs.rst b/ci/docs.rst index a2c9683..1963b5c 100644 --- a/ci/docs.rst +++ b/ci/docs.rst @@ -7,14 +7,14 @@ The docs Repository =================== -.. _docs repository: https://booting.oniroproject.org/distro/docs.git +.. _docs repository: https://gitlab.eclipse.org/eclipse/oniro-core/docs.git The `docs repository`_ contains the general documentation of the |main_project_name| project. The documentation is normally written in reStructuredText, with an important difference. Unlike in a regular project, the documentation here is not standalone. Instead, the git repository contains symbolic links that are valid when an entire workspace is constructed with `oniro -<https://booting.oniroproject.org/distro/oniro>`_ repository. +<https://gitlab.eclipse.org/eclipse/oniro-core/oniro>`_ reposiotory. This complicates the testing process and the deployment process, but allows the resulting documentation to span multiple repositories, permitting code and text @@ -40,7 +40,7 @@ de-referencing any links that were followed to other repositories, and commits t updated set of files to helper repository which is observed by readthedocs. The helper repository is called `oniro-readthedocs-aggregated -<https://booting.oniroproject.org/distro/oniro-readthedocs-aggregated>`_. +<https://gitlab.eclipse.org/eclipse/oniro-core/oniro-readthedocs-aggregated>`_. That repository contains a webhook, configured at the level of the GitLab project, which asks readthedocs to re-build the documentation. diff --git a/ci/index.rst b/ci/index.rst index 7d60295..79a06ca 100644 --- a/ci/index.rst +++ b/ci/index.rst @@ -7,7 +7,7 @@ Continuous Integration ====================== -|main_project_name| ``git`` repositories hosted on https://booting.oniroproject.org/distro use +|main_project_name| ``git`` repositories hosted on https://gitlab.eclipse.org/eclipse/oniro-core use GitLab pipelines for building and testing changes before they are merged. Individual pipelines are documented in each repository, but some general or more important elements are described below. diff --git a/ci/oniro.rst b/ci/oniro.rst index 219c441..4490346 100644 --- a/ci/oniro.rst +++ b/ci/oniro.rst @@ -7,7 +7,7 @@ The oniro Repository ==================== -.. _oniro repository: https://booting.oniroproject.org/distro/oniro.git +.. _oniro repository: https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git The `oniro repository`_ contains meta-layers specific to |main_project_name| and is the most important repository. diff --git a/contributing/gitlab.rst b/contributing/gitlab.rst index 584cd48..bb08fe1 100644 --- a/contributing/gitlab.rst +++ b/contributing/gitlab.rst @@ -14,7 +14,7 @@ Overview ******** |main_project_name| project handles contributions as `merge requests <https://docs.gitlab.com/ee/user/project/merge_requests/>`_ -to relevant repositories part of the |main_project_name| `GitLab instance <https://booting.oniroproject.org/distro/oniro>`_. +to relevant repositories part of the |main_project_name| `GitLab instance <https://gitlab.eclipse.org/eclipse/oniro-core>`_. The flow for handling that is classic: fork-based merge requests. This means that once you have an account, you can fork any repository, create a branch with proposed changes and raise a merge request against the forked repository. @@ -134,7 +134,7 @@ to remain the same. The only difference is that documentation files are to be released under ``Creative Commons License version 4.0``. Documentation that doesn't link directly to one specific repository, is -available in the `docs repository <https://booting.oniroproject.org/distro/docs>`_. +available in the `docs repository <https://gitlab.eclipse.org/eclipse/oniro-core/docs>`_. In terms of file format, the project unifies its documentation as ``ReStructuredText`` files. A RestructuredText primer is available as part of diff --git a/releases/jasmine/1.0.0/release_notes.rst b/releases/jasmine/1.0.0/release_notes.rst index e98a52c..3cac9db 100644 --- a/releases/jasmine/1.0.0/release_notes.rst +++ b/releases/jasmine/1.0.0/release_notes.rst @@ -109,7 +109,7 @@ for the repo init commands as follows: .. code-block:: console - repo init -u https://booting.oniroproject.org/distro/oniro.git -b v1.0.0 + repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b v1.0.0 Known Issues ------------ @@ -125,7 +125,7 @@ Source Code Available For more details on our repo structure, see: -`OniroProject's GitLab <https://booting.oniroproject.org/distro/>`__ document +`OniroProject's GitLab <https://gitlab.eclipse.org/eclipse/oniro-core>`__ document The release is signed with the key: -- GitLab