Skip to content

Commit

Permalink
Merge pull request #30 from t4d-gmbh/28-part-0-short-intro
Browse files Browse the repository at this point in the history
28 part 0 short intro
  • Loading branch information
j-i-l authored Oct 28, 2024
2 parents 2d67d14 + bc6d4eb commit a7cecb9
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Using Git in Academia

A course for the casual git user...
A seminar for the casual git user...

<!-- readme-include -->
## Content
Expand Down Expand Up @@ -69,7 +69,7 @@ _That would be the end of part 1_
---


### 3. Part: Continuous Integration and Delivery
### 3. Part: [CI/CD Workflows](https://github.com/t4d-gmbh/ci-cd-workflows)

#### Why remotes offer automation
- Get an idea about the vast application possibilities of automation
Expand Down
4 changes: 2 additions & 2 deletions source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


project = 'Git in Academia'
copyright = '2023-2024, T4D GmbH'
copyright = '2023-2024; T4D GmbH'
author = 'Jonas I. Liechti'
# ###
# Versioning - get it from the git tag
Expand Down Expand Up @@ -88,7 +88,7 @@
}

favicons = [
"_static/T4D_logo_bw.svg"
"T4D_logo.png"
]

myst_enable_extensions = [
Expand Down
6 changes: 4 additions & 2 deletions source/content/about/config.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Tools
## Setup

- It will be advantageous if you have your laptop ready
- Have your laptop ready.
- Have an account on <i class="fab fa-github"></i> **GitHub** and any <i class="fab fa-gitlab"></i> **GitLab** instance.
- Configure your <i class="fab fa-github"></i> **GitHub** account so you can use `ssh` (i.e. add an `ssh`-key to your account).
6 changes: 5 additions & 1 deletion source/content/about/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Premises
# About this Seminar
```{toctree}
:maxdepth: {% if build == "slides" %}1{% else %}2{% endif %}
:numbered:
./syllabus
{% if slide %}
./requirements
./presenters
{% endif %}
```
Binary file added source/content/about/jonas_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions source/content/about/knowledge.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
## Prior knowledge

- You should be familiar with the **git commands**:
- You should be familiar with the <i class="fab fa-git"></i> **commands**:
- `pull`
- `push`
- `commit`

- Having heard of and used `GitHub` and `GitLab` is a plus

- Familiarity with and experience using <i class="fab fa-github"></i> **GitHub** and <i class="fab fa-gitlab"></i> **GitLab** is an advantage.
Binary file added source/content/about/matteo_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions source/content/about/presenters.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Presenters

::::{grid}
:::{grid-item-card} @j-i-l
![Jonas](./jonas_github.png)
:::
:::{grid-item-card} @matteodelucchi
![Matteo](./matteo_github.png)
:::
::::
10 changes: 0 additions & 10 deletions source/content/about/requirements.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
# Requirements

{% if build == "slides" %}
```{toctree}
:maxdepth: 2
:caption: Contents
./knowledge
./config
```
{% else %}
```{include} ./knowledge.md
```
```{include} ./config.md
```
{% endif %}


19 changes: 17 additions & 2 deletions source/content/about/syllabus.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
{% if page %}
# Syllabus
{% else %}
# Schedule
{% endif %}

{% if page %}
```{include} ../../../README.md
:start-after: <!-- syllabus-include -->
:end-before: <!-- syllabus-exclude-->
```
{% else %}
```{include} ../parts/index.md
```
:::{card} Day 1
1. Part: **[Working with git](https://github.com/t4d-gmbh/working-with-git)**

---
2. Part: **[Git and its Remotes](https://github.com/t4d-gmbh/git-and-its-remotes)**

:::
:::{card} Day 2
3. Part: **[CI/CD Workflows](https://github.com/t4d-gmbh/ci-cd-workflows)**

---
4. Part: **[Git and Science](https://github.com/t4d-gmbh/git-and-science)**
:::
{% endif %}

5 changes: 3 additions & 2 deletions source/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

```{toctree}
:caption: About
:maxdepth: {% if build == "slides" %}0{% else %}2{% endif %}
:maxdepth: {% if build == "slides" %}1{% else %}2{% endif %}
{% if build == "slides" %}:numbered:
:hidden:
{% endif %}
content/about/index
Expand All @@ -16,7 +17,7 @@ content/about/index
{% endif %}
```{toctree}
:caption: Working with Git
:maxdepth: {% if build == "slides" %}0{% else %}2{% endif %}
:maxdepth: {% if build == "slides" %}1{% else %}2{% endif %}
{% if build == "slides" %}:numbered:
:hidden:
{% endif %}
Expand Down

0 comments on commit a7cecb9

Please sign in to comment.