Skip to content

Commit c0d7e09

Browse files
Prepare for simplified branching model (#39)
Instead of following (more or less) "git flow", just develop along a single branch, which will be renamed from "develop" to "main". Releases will use a branch with two commits: The first sets the release version, the second sets the following `-DEV` version. Once the commit with the release version has been tagged successfully, the branch will be merged (without rebasing/squashing!) into "main". This prepares that step by removing refernce to the "master" branch and replacing references to "develop" by "main".
1 parent 2529706 commit c0d7e09

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/Documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Documentation
33
on:
44
push:
55
branches:
6-
- develop
6+
- main
77
tags: '*'
88
pull_request:
99
workflow_dispatch:

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- develop
7-
- master
6+
- main
87
tags: '*'
98
pull_request:
109
workflow_dispatch:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
[![Documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://hsu-ant.github.io/ACME.jl/dev/)
66
[![DOI](https://zenodo.org/badge/48224425.svg)](https://zenodo.org/badge/latestdoi/48224425)
77

8-
[![CI](https://github.com/HSU-ANT/ACME.jl/workflows/CI/badge.svg)](https://github.com/HSU-ANT/ACME.jl/actions?query=workflow%3ACI+branch%3Adevelop)
9-
[![codecov](https://codecov.io/gh/HSU-ANT/ACME.jl/branch/develop/graph/badge.svg)](https://codecov.io/gh/HSU-ANT/ACME.jl)
10-
[![Coverage Status](https://coveralls.io/repos/github/HSU-ANT/ACME.jl/badge.svg?branch=develop)](https://coveralls.io/github/HSU-ANT/ACME.jl)
8+
[![CI](https://github.com/HSU-ANT/ACME.jl/workflows/CI/badge.svg)](https://github.com/HSU-ANT/ACME.jl/actions?query=workflow%3ACI+branch%3Amain)
9+
[![codecov](https://codecov.io/gh/HSU-ANT/ACME.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/HSU-ANT/ACME.jl)
10+
[![Coverage Status](https://coveralls.io/repos/github/HSU-ANT/ACME.jl/badge.svg?branch=main)](https://coveralls.io/github/HSU-ANT/ACME.jl)
1111

1212
ACME is a [Julia](http://julialang.org/) package for the simulation of
1313
electrical circuits, focusing on audio effect circuits. It allows to

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ makedocs(
1414
if v"1.0" VERSION < v"1.1" # deploy from 1.0
1515
deploydocs(
1616
repo = "github.com/HSU-ANT/ACME.jl.git",
17-
devbranch = "develop",
17+
devbranch = "main",
1818
)
1919
end

0 commit comments

Comments
 (0)