Skip to content

Commit

Permalink
Merge pull request #420 from CPS-IT/task/main-branch
Browse files Browse the repository at this point in the history
[TASK] Drop Git Flow and use main branch as default branch
  • Loading branch information
eliashaeussler authored Dec 11, 2023
2 parents 9a06b6d + bd5a216 commit 835f61a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/cgl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ on:
push:
branches:
- main
- develop
pull_request:
branches:
- '**'
- main

jobs:
cgl:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ on:
push:
branches:
- main
- develop
pull_request:
branches:
- '**'
- main

jobs:
tests:
Expand Down
8 changes: 2 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,8 @@ Once you have finished your work, please **submit a pull request** and describe
what you've done. Ideally, your PR references an issue describing the problem
you're trying to solve.

**Note: As we're using [Git Flow][1], please make sure to submit your pull request
against the `develop` branch of this repository.**

All described code quality tools are automatically executed on each pull request
for all currently supported PHP versions. Take a look at the appropriate
[workflows][2] to get a detailed overview.
[workflows][1] to get a detailed overview.

[1]: http://nvie.com/git-model
[2]: .github/workflows
[1]: .github/workflows
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Frontend Asset Handler

[![Coverage](https://codecov.io/gh/CPS-IT/frontend-asset-handler/branch/develop/graph/badge.svg?token=P4F5YYWAJX)](https://codecov.io/gh/CPS-IT/frontend-asset-handler)
[![Coverage](https://codecov.io/gh/CPS-IT/frontend-asset-handler/branch/main/graph/badge.svg?token=P4F5YYWAJX)](https://codecov.io/gh/CPS-IT/frontend-asset-handler)
[![Tests](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/tests.yaml/badge.svg)](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/tests.yaml)
[![CGL](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/cgl.yaml/badge.svg)](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/cgl.yaml)
[![Latest Stable Version](http://poser.pugx.org/cpsit/frontend-asset-handler/v)](https://packagist.org/packages/cpsit/frontend-asset-handler)
Expand Down
3 changes: 1 addition & 2 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>CPS-IT/renovate-config",
"local>CPS-IT/renovate-config:git-flow"
"local>CPS-IT/renovate-config"
],
"assignees": [
"eliashaeussler"
Expand Down

0 comments on commit 835f61a

Please sign in to comment.