Skip to content

Commit

Permalink
Add steps to manage deps via renovate [skip ci] (#1228)
Browse files Browse the repository at this point in the history
* Add steps to manage deps via renovate [skip ci]

Signed-off-by: wslulciuc <[email protected]>

* continued: Add steps to manage deps via renovate [skip ci]

Signed-off-by: wslulciuc <[email protected]>
  • Loading branch information
wslulciuc committed Apr 18, 2021
1 parent 0b28b7b commit 8c818fb
Showing 1 changed file with 36 additions and 1 deletion.
37 changes: 36 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,42 @@ To ensure your pull request is accepted, follow these guidelines:

* Choose _short_ and _descriptive_ branch names
* Use dashes (`-`) to separate _words_ in branch names
* Use _lowercase_ in branch names
* Use _lowercase_ in branch names

# Dependencies

We use [renovate](https://github.com/renovatebot/renovate) to manage dependencies for all of our project modules. Renovate automatically opens pull requests against our [`update-deps`](https://github.com/MarquezProject/marquez/tree/update-deps) branch in order to ensure builds pass before merging into `main`. To merge dependencies updates:

> **Note:** Make sure you've pulled the latest upstream changes for `update-deps` and `main`.
1. Switch to `update-deps`:

```bash
$ git checkout update-deps
```

2. Merge `main` into `update-deps` (make sure to address any merge conflicts, if any), then push:

```bash
$ git merge main
$ git push origin update-deps
```

3. Branch off `update-deps`:


```bash
$ git checkout -b deps/renovate
```

4. Push your branch:


```bash
$ git push origin deps/renovate
```

5. Then, open a pull request against `main`

# Sign Your Work

Expand Down

0 comments on commit 8c818fb

Please sign in to comment.