Skip to content

Commit

Permalink
Layout for second half of the day
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusTiede committed Aug 27, 2024
1 parent ecfc352 commit 00aa354
Showing 1 changed file with 108 additions and 4 deletions.
112 changes: 108 additions & 4 deletions docs/slides/2024-1x1/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ Zeipunkt(e)

[Open Source Guidelines](https://baloise.github.io/open-source/docs/arc42/)
---
# β˜•
# 🍡

[15'](https://youtu.be/1gQJUjgCqrU)
---
Expand Down Expand Up @@ -362,21 +362,125 @@ git version 2.39.3 (Apple Git-146)
---
# πŸ₯—
---
# πŸ’ͺ

## Mitwirken

Warum?
--
## Upstream & Downstream

![](https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/supply-chain-funnel.png)

[OSPO-101.6.1](https://digital-sustainability.github.io/module-eoss-ospo101/module6/)
--
![](https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/dev-without-upstreaming.png)
--
![](https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/dev-with-upstreaming.png)
--
Semantic Versioning 2.0.0

```md[1|3-4|6-7|9-10|4,7,10|]
Given a version number MAJOR.MINOR.PATCH, increment the:
MAJOR version when you
> make **incompatible** API changes
MINOR version when you
> add functionality in a backward *compatible* manner
PATCH version when you
> make backward *compatible* bug fixes
```

https://semver.org
--
<!-- .element: data-background-color="SeaGreen" -->
# πŸ”’

> Du aktualisierst eine AbhΓ€ngigkeit von Version `1.4.2` auf `1.6.1` - worauf solltest du bei diesem Versionswechsel achten?
---
# β˜•
# πŸ€”

## Wie?
--

# <img width="128" src="https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/github.svg" />

https://github.com

# <img width="128" src="https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/gitlab.svg" />


https://gitlab.com
--
<!-- .element: data-background-color="SeaGreen" -->
# πŸ™

>
---
# πŸ’‘

## IP

Intellectual Property
--
# DCOs & CLAs

Committer, Authors, Reviewer, Maintainer, ...
--
# πŸ§‘β€πŸŽ¨ & πŸ§‘β€πŸ’»

### [Author & Committer](https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History)
--
# πŸ“ & πŸ–‹οΈ

### Developer Certificate of Origin ([DCO](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin))

[git commit](https://git-scm.com/docs/git-commit) `--signoff -m "My change"`

### Contributor License Agreement ([CLA](https://en.wikipedia.org/wiki/Contributor_License_Agreement))
--
<!-- .element: data-background-color="SeaGreen" -->
# πŸ“

>
---
# πŸ«–

[15'](https://youtu.be/1gQJUjgCqrU)
---
# ⬆️

## Upstream Practices

(draft) Pull, Merge Requests
--
![](https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/setup.png)
--
![](https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/pull-requests.png)
--
typical

## Contribution Flow

1. Fork & Clone
2. Pull updates from upstream, push changes to origin
3. Create merge / pull request from fork to upstream project
--
<img src="https://github.com/digital-sustainability/module-eoss-ospo101/raw/main/module6/signal-intent.png" width="640px">
---

---
# β˜•

---
# πŸ§‹

[15'](https://youtu.be/1gQJUjgCqrU)
---

---
# β˜•
# 🍺

[15'](https://youtu.be/1gQJUjgCqrU)
---

0 comments on commit 00aa354

Please sign in to comment.