diff --git a/.gitignore b/.gitignore index 505f6e21fb982845d7a34b0509c11f2c3f74ed80..6d37eac67d63ea4d0dc01f4384ebda67e38f4e79 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,8 @@ assets/img/jumbotrons/desktop/ assets/img/jumbotrons/display_2k/ assets/img/jumbotrons/phone/ assets/img/jumbotrons/tablet/ + +# Places for artifacts to be downloaded automatically from respective repositories +workshop-materials/*/ +doc/ +assets/videos/video_full.mp4 \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbd90c1878866f150e67c62e6c7c2eeba806cac7..d01faedf48c8a5c77d5aeb3940605bd1c2df80c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ stages: - "[[ -x \"$(command -v apt-get)\" ]] && \ apt-get update && \ apt-get install -y ffmpeg" - - wget https://gitlab.hzdr.de/hifis/overall/communication/hifis-teaser-video/-/jobs/artifacts/main/raw/video/video_full.mp4?job=video_build -O assets/videos/video_full.mp4 + - ./fetch_external_content.sh - gem install bundler --no-document - bundle config set without 'test' - bundle install --jobs $(nproc) diff --git a/fetch_external_content.sh b/fetch_external_content.sh new file mode 100755 index 0000000000000000000000000000000000000000..51a7b925edf384bfec88b6ff452309425e08218d --- /dev/null +++ b/fetch_external_content.sh @@ -0,0 +1,38 @@ +#/bin/bash + +# This script is to download and place correctly materials from external (still HIFIS maintained) ressources. +# So far, this is done one-by-one, might be automated or looped some time in the future, when series of alike data shall be integrated + +# A little helper function to include the contents of an external site generated with mkdocs. +# Parameter 1 is the site to include, +# Parameter 2 is the directory under which to place the included site +function include_mkdocs(){ + pushd $2 + wget $1 -O download.zip + unzip download.zip + # Cleanup + rm -v download.zip + mv -v public/* . + rm -v 404.* # We have our own, thank you very much + popd +} + +# ---------- + +# 1. Get content for education/training materials. +include_mkdocs \ + "https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-oop-in-python/-/jobs/artifacts/main/download?job=pages" \ + "workshop-materials/python-oop/" + +include_mkdocs \ + "https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-pandas/-/jobs/artifacts/main/download?job=pages" \ + "workshop-materials/python-pandas/" + +# 2. Get HIFIS Intro letter +# tbd + +# 3. Get HIFIS Teaser Video +wget https://gitlab.hzdr.de/hifis/overall/communication/hifis-teaser-video/-/jobs/artifacts/main/raw/video/video_full.mp4?job=video_build -O assets/videos/video_full.mp4 + +# 4. Get Administrative and Technical Documentation +# tbd diff --git a/services/overall/learning-materials.md b/services/overall/learning-materials.md index 634fbb71ba23549abde1b5efd65f1957a0e42d0c..c091ee9de4235fe86e939d66f90491bb6353565b 100644 --- a/services/overall/learning-materials.md +++ b/services/overall/learning-materials.md @@ -17,7 +17,7 @@ excerpt: ## Workshop Material -[Course material](https://gitlab.com/hifis/hifis-workshops) is available for use and reuse under a Creative Commons License. +- [Course and Workshop material]({{ "workshop-materials" | relative_url }}) is available for use and reuse under a Creative Commons License. ## Tutorials diff --git a/workshop-materials/index.md b/workshop-materials/index.md new file mode 100644 index 0000000000000000000000000000000000000000..fc2e1597e359cfce6c909f10a3a65611eecfe075 --- /dev/null +++ b/workshop-materials/index.md @@ -0,0 +1,31 @@ +--- +title: Workshop Materials +title_image: default +layout: default +additional_css: + - frontpage.css + - title/service-title-buttons.css +additional_js: frontpage.js +excerpt: + HIFIS Workshop Materials. +--- + +## Published Workshop Materials + + +### Python + +* **OOP in Python:**: +[**Material**]({{ "workshop-materials/python-oop/" | relative_url }}) +[Repository](https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-oop-in-python) +* **Pandas:** +[**Material**]({{ "workshop-materials/python-pandas/" | relative_url }}) +[Repository](https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-pandas) + +## Further links + +More materials will be added soon here. +See also our gitlab and github repositories for further workshop information. + +- <https://gitlab.com/hifis/hifis-workshops> +- <https://gitlab.hzdr.de/hifis/software/education/hifis-workshops> diff --git a/workshop-materials/python-oop/.gitkeep b/workshop-materials/python-oop/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/workshop-materials/python-oop/.gitkeep @@ -0,0 +1 @@ + diff --git a/workshop-materials/python-pandas/.gitkeep b/workshop-materials/python-pandas/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391