From 2293aba6b2622a8a549c9ee35965cfc48b0f4498 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Fri, 29 May 2020 10:46:16 +0200 Subject: [PATCH] [web] Adapted some more GitLab links in content. --- .../devguide/advanced/conan-package-manager.pandoc | 2 +- .../docs/devguide/getting-started/prerequisites.pandoc | 2 +- .../docs/devguide/procedures/publish-a-release.pandoc | 10 +++++----- web/content/docs/devguide/testing/test-data.pandoc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/content/docs/devguide/advanced/conan-package-manager.pandoc b/web/content/docs/devguide/advanced/conan-package-manager.pandoc index be43c53d5b7..9ebcfcef11d 100644 --- a/web/content/docs/devguide/advanced/conan-package-manager.pandoc +++ b/web/content/docs/devguide/advanced/conan-package-manager.pandoc @@ -24,7 +24,7 @@ Per default when Conan is enabled it will try to fetch prebuilt binaries from th - `missing` - Default, only builds packages which are not available as a prebuilt binary for the current configuration - `all` - Builds all packages locally - `never` - Builds no package locally -- `[a list of libraries to build]`, e.g. `"Eigen3;Boost"`. For names see [ConanSetup.cmake](https://github.com/ufz/ogs/blob/master/scripts/cmake/ConanSetup.cmake). Make sure to set this back to 'never' after the libs have been built. Otherwise it would rebuild the libs on the next CMake run. +- `[a list of libraries to build]`, e.g. `"Eigen3;Boost"`. For names see [ConanSetup.cmake](https://gitlab.opengeosys.org/ogs/ogs/-/blob/master/scripts/cmake/ConanSetup.cmake). Make sure to set this back to 'never' after the libs have been built. Otherwise it would rebuild the libs on the next CMake run. ## Further information diff --git a/web/content/docs/devguide/getting-started/prerequisites.pandoc b/web/content/docs/devguide/getting-started/prerequisites.pandoc index fa1f8a85316..1619105d863 100644 --- a/web/content/docs/devguide/getting-started/prerequisites.pandoc +++ b/web/content/docs/devguide/getting-started/prerequisites.pandoc @@ -99,7 +99,7 @@ The Homebrew package manager is needed for installing other libraries and packag ## Step: Install Git -Git is a powerful and distributed version control system. OGS source code is hosted on [GitHub](https://github.com/ufz/ogs). See the developer guide page on [Code Reviews]({{< ref "code-reviews" >}}) for more info on how OGS uses GitHub for collaborative development. +Git is a powerful and distributed version control system. OGS source code is hosted on [GitLab](https://gitlab.opengeosys.org/ogs/ogs). See the developer guide page on [Code Reviews]({{< ref "code-reviews" >}}) for more info on how OGS uses GitLab for collaborative development. ::: {.win} Download and install git from the [git homepage](http://git-scm.com/download/win). Use the default installer options but also enable `Enable symbolic links` under the *Configuring extra options* page. diff --git a/web/content/docs/devguide/procedures/publish-a-release.pandoc b/web/content/docs/devguide/procedures/publish-a-release.pandoc index 9b496261ea9..c00f3c5c0e0 100644 --- a/web/content/docs/devguide/procedures/publish-a-release.pandoc +++ b/web/content/docs/devguide/procedures/publish-a-release.pandoc @@ -15,12 +15,12 @@ weight = 1051 - Update `.github/PULL_REQUEST_TEMPLATE.md` to point to a new changelog wiki page - Replace `#([0-9][0-9][0-9][0-9])` with `[#$1](https://github.com/ufz/ogs/pull/$1)` (e.g. in VS Code) - Tag the release commit as an annotated tag (`git tag -a 6.0.8 -m "OpenGeoSys Release 6.0.8"`) -- Create a [new release on GitHub](https://github.com/ufz/ogs/releases) +- Create a [new release on GitLab](https://gitlab.opengeosys.org/ogs/ogs/-/releases) - Fill in the release notes from the Wiki -- Start the `ufz/master` Jenkins job manually and check that it ran successfully! (Do not push to `master` until job ran successfully!) -- Copy release binaries from Jenkins job to GitHub release page -- Create and copy container images to GitHub release page +- TODO! +- Copy release binaries from Jenkins job to GitLab release page +- Create and copy container images to GitLab release page - Update web release page with generated artifacts -- Check new [Zenodo release](https://zenodo.org/account/settings/github/repository/ufz/ogs#) +- TODO: Check new [Zenodo release](https://zenodo.org/account/settings/github/repository/ufz/ogs#) - Create a discourse announcement post diff --git a/web/content/docs/devguide/testing/test-data.pandoc b/web/content/docs/devguide/testing/test-data.pandoc index e383db56136..ec491957c2c 100644 --- a/web/content/docs/devguide/testing/test-data.pandoc +++ b/web/content/docs/devguide/testing/test-data.pandoc @@ -37,6 +37,6 @@ In the OGS-cli outputting to `[build-dir]/Tests/Data` is already handled (via th In code `BaseLib::BuildInfo::data_path` (from `BuildInfo.h`) references the data source directory and `BaseLib::BuildInfo::data_binary_path` references the data output directory. -For adding new data files make sure you have [setup git lfs](../../getting-started/prerequisites) already. Then simply commit the new files as usual. For pushing you need to have [setup an account]({{< ref "gitlab.pandoc" >}}) on our own GitLab server as the lfs files are stored there (due to bandwidth limitations on GitHub). When asked for GitLab credentials on pushing use your GitLab account name (should be the same as the GitHub account name) and your created GitLab personal access token ([see the GitLab Setup page]({{< ref "gitlab.pandoc" >}})). +For adding new data files make sure you have [setup git lfs](../../getting-started/prerequisites) already. Then simply commit the new files as usual. Check this [in-depth tutorial](https://www.atlassian.com/git/tutorials/git-lfs) to learn more about git lfs. -- GitLab