From 794214af4e06b99552cbfd424d534dbc46ccc50e Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 24 Jun 2020 11:43:50 +0200 Subject: [PATCH] [web] Removed git lfs instructions. --- .../docs/devguide/advanced/singularity.pandoc | 2 +- .../devguide/advanced/working-on-eve.pandoc | 2 +- .../documentation/introduction.pandoc | 2 +- .../getting-started/prerequisites.pandoc | 38 +------------------ .../docs/devguide/testing/test-data.pandoc | 5 +-- .../docs/devguide/troubleshooting/git.pandoc | 24 ------------ 6 files changed, 6 insertions(+), 67 deletions(-) diff --git a/web/content/docs/devguide/advanced/singularity.pandoc b/web/content/docs/devguide/advanced/singularity.pandoc index 16feae67be2..503cc4f225a 100644 --- a/web/content/docs/devguide/advanced/singularity.pandoc +++ b/web/content/docs/devguide/advanced/singularity.pandoc @@ -24,7 +24,7 @@ Singularity per default mounts your home directory and also passes your current - Linux and [Mac](https://sylabs.io/singularity-desktop-macos/) only! - Note: You can run Singularity on Windows inside a virtual machine using [WSL 2](https://docs.microsoft.com/en-us/windows/wsl/install-win10) -- [Install Git with LFS]({{< ref "prerequisites" >}}/#step-install-git) +- [Install Git]({{< ref "prerequisites" >}}/#step-install-git) - [Install Singularity](https://sylabs.io/guides/3.5/user-guide/quick_start.html#quick-installation-steps) ### Build OGS inside a container diff --git a/web/content/docs/devguide/advanced/working-on-eve.pandoc b/web/content/docs/devguide/advanced/working-on-eve.pandoc index 2e34cb9c33e..fba3c22341b 100644 --- a/web/content/docs/devguide/advanced/working-on-eve.pandoc +++ b/web/content/docs/devguide/advanced/working-on-eve.pandoc @@ -20,7 +20,7 @@ You need to opt-in to use the [EasyBuild modules](https://wiki.ufz.de/eve/index. - Run `touch ~/.easybuild-yes` - `exit` and re-login -Also on eve the installed git module (2.10) is over 2 years old and we recommend using a newer module (especially when you have problems with fetching or checking out of Git LFS files): +Also on eve the installed git module (2.10) is over 2 years old and we recommend using a newer module: ```bash ml use /global/apps/modulefiles diff --git a/web/content/docs/devguide/documentation/introduction.pandoc b/web/content/docs/devguide/documentation/introduction.pandoc index 70305ca1092..59b0d35db0c 100644 --- a/web/content/docs/devguide/documentation/introduction.pandoc +++ b/web/content/docs/devguide/documentation/introduction.pandoc @@ -90,7 +90,7 @@ Equations can be set with typical LaTeX syntax by using [MathJax](https://www.ma #### Files and Downloads -Files belonging directly to a page (e.g. images shown on that same page) should be added directly (they are stored by git lfs). Other stuff such as linked PDF files, book chapter input files should be uploaded elsewhere and linked to. You can ask @bilke to host these files for you (on Azure cloud storage). +Files belonging directly to a page (e.g. images shown on that same page) should be added directly. Other stuff such as linked PDF files, book chapter input files should be uploaded elsewhere and linked to. You can ask @bilke to host these files for you (on Azure cloud storage). #### Bibliography references diff --git a/web/content/docs/devguide/getting-started/prerequisites.pandoc b/web/content/docs/devguide/getting-started/prerequisites.pandoc index 1619105d863..505f080ea27 100644 --- a/web/content/docs/devguide/getting-started/prerequisites.pandoc +++ b/web/content/docs/devguide/getting-started/prerequisites.pandoc @@ -133,8 +133,7 @@ git version {{< dataFile "versions.minimum_version.git" >}} Otherwise please install Git with your favorite package manager: ```bash -$ sudo yum install git // RPM-based systems -$ sudo apt-get install git // Debian-based systems +$ sudo apt-get install git ``` Let Git know who you are: @@ -180,41 +179,6 @@ git config --global http.proxy http://yourproxy.example.com ``` ::: - -## Step: Install Git LFS - -[Git LFS](https://git-lfs.github.com/) (large file storage) is a git extension dealing with large binary files such as images and is used for the documentation. You don't need to worry about anything but you need to install the extension as it is not a part of standard git. - -::: {.win} -- Git LFS is already part of your regular git installation, to enable it run: `git lfs install` in the command line -::: - -::: {.linux} -Install via [PackageCloud](https://packagecloud.io/): - -```bash -$ curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash -$ sudo apt-get install git-lfs -$ git lfs install -``` -::: - -::: {.mac} -Install with Homebrew: - -```bash -$ brew install git-lfs -$ git lfs install -``` -::: - -::: {.note} -### <i class="far fa-info-circle"></i> Git LFS installation without admin rights - -If you do not have rights to install a system package (e.g. on cluster systems) you can [download](https://github.com/git-lfs/git-lfs/releases/latest) a precompiled `git-lfs` executable. Simply put it into your `PATH` and everything should work (remember to run `git lfs install` once!). See also: <https://github.com/git-lfs/git-lfs/wiki/Installation#other> -::: - - ## Step: Install Python 3 ::: {.win} diff --git a/web/content/docs/devguide/testing/test-data.pandoc b/web/content/docs/devguide/testing/test-data.pandoc index ec491957c2c..a1ecadb579a 100644 --- a/web/content/docs/devguide/testing/test-data.pandoc +++ b/web/content/docs/devguide/testing/test-data.pandoc @@ -31,12 +31,11 @@ The functionality is very flexible and more wrappers and checker can be added la ## Test Data -Test data is stored with git lfs in `Tests/Data`. Generated test output files should be found in `[build-dir]/Tests/Data`. +Test data is stored in `Tests/Data`. Generated test output files should be found in `[build-dir]/Tests/Data`. In the OGS-cli outputting to `[build-dir]/Tests/Data` is already handled (via the `-o` parameter). For other executables you have to implement this, e.g. a with parameter specifying the output directory. 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 adding new data files 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. diff --git a/web/content/docs/devguide/troubleshooting/git.pandoc b/web/content/docs/devguide/troubleshooting/git.pandoc index cac2bce32a5..8d12f275e7a 100644 --- a/web/content/docs/devguide/troubleshooting/git.pandoc +++ b/web/content/docs/devguide/troubleshooting/git.pandoc @@ -14,27 +14,3 @@ weight = 1044 If you have any Git-related questions first look at these links: - [Git Flight Rules](https://github.com/k88hudson/git-flight-rules) - - -## Git-LFS issues - -### *The system cannot find the file specified.* - -Example error output: - -```bash -open C:\data\code\ogs6\ogs\Tests\Data\Mechanics\Ehlers\ref_axisymmetric_sphere_pcs_0_ts_100_t_1.000000.vtu: The system cannot find the file specified. -error: failed to push some refs to 'git@github.com:bilke/ogs.git' -``` - -Solution: - -Fetch all lfs files from `ufz/ogs` and push them to your remote. - -```bash -# this downloads ALL lfs objects from the old lfs server -git lfs fetch --all origin # or upstream, this should point to ufz/ogs - -# pushes ALL lfs objects to the new lfs server -git lfs push --all my-remote # this should point to your remote -``` -- GitLab