Skip to content

Commit

Permalink
Merge pull request #29 from trixi-framework/rename-master-to-main
Browse files Browse the repository at this point in the history
Rename `master` to `main`
  • Loading branch information
sloede authored Feb 10, 2021
2 parents 9b22db5 + 4382e62 commit dae36db
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
paths-ignore:
- 'LICENSE.md'
- 'README.md'
Expand Down
4 changes: 2 additions & 2 deletions .outdated/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
allow_failures:
- julia: nightly
include:
- if: type = push AND branch = master
- if: type = push AND branch = main
julia: 1
os: osx
# - stage: "Documentation"
Expand All @@ -32,7 +32,7 @@ coveralls: true
# avoid duplicate tests in PRs
branches:
only:
- master
- main

notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion .outdated/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform:

branches:
only:
- master
- main
- /release-.*/

# Do not build on tags (GitHub, Bitbucket, GitLab, Gitea)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Docs-stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://trixi-framework.github.io/Trixi.jl/stable)
[![Build Status](https://github.com/trixi-framework/Trixi2Vtk.jl/workflows/CI/badge.svg)](https://github.com/trixi-framework/Trixi2Vtk.jl/actions?query=workflow%3ACI)
[![Coveralls](https://coveralls.io/repos/github/trixi-framework/Trixi2Vtk.jl/badge.svg?branch=master)](https://coveralls.io/github/trixi-framework/Trixi2Vtk.jl?branch=master)
[![Coveralls](https://coveralls.io/repos/github/trixi-framework/Trixi2Vtk.jl/badge.svg?branch=main)](https://coveralls.io/github/trixi-framework/Trixi2Vtk.jl?branch=main)
[![License: MIT](https://img.shields.io/badge/License-MIT-success.svg)](https://opensource.org/licenses/MIT)
[![GitHub commits since tagged version](https://img.shields.io/github/commits-since/trixi-framework/Trixi2Vtk.jl/v0.2.4.svg?style=social&logo=github)](https://github.com/trixi-framework/Trixi2Vtk.jl)

Expand Down Expand Up @@ -50,7 +50,7 @@ For further information on how to use Trixi with Trixi2Vtk, please refer to the

## Authors
Trixi2Vtk is maintained by the
[Trixi authors](https://github.com/trixi-framework/Trixi.jl/blob/master/AUTHORS.md).
[Trixi authors](https://github.com/trixi-framework/Trixi.jl/blob/main/AUTHORS.md).
Its principal developers are
[Michael Schlottke-Lakemper](https://www.mi.uni-koeln.de/NumSim/schlottke-lakemper)
(University of Cologne, Germany) and [Hendrik Ranocha](https://ranocha.de)
Expand Down

0 comments on commit dae36db

Please sign in to comment.