Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove development branch #68

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Remove development branch #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build

on:
push:
branches: [main, development]
branches: [main]
pull_request:
branches: [main, development, feature/*]
branches: [main, feature/*]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- created

#pull_request: # test-only
#branches: [ main, development, feature/* ] # test-only
#branches: [ main, feature/* ] # test-only

jobs:
publish:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
# pull_request:
# branches: [ main, development, feature/* ]
# branches: [ main, feature/* ]

jobs:
build:
Expand Down
12 changes: 1 addition & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,13 @@ by [**Juan Rada-Vilela, PhD**](https://fuzzylite.com/about)

***

[main branch](https://github.com/fuzzylite/pyfuzzylite/tree/main)
[![Build](
https://github.com/fuzzylite/pyfuzzylite/actions/workflows/build.yml/badge.svg?branch=main)](
https://github.com/fuzzylite/pyfuzzylite/actions/workflows/build.yml)
https://github.com/fuzzylite/pyfuzzylite/actions/workflows/build.yml)
[![Coverage Status](
https://coveralls.io/repos/github/fuzzylite/pyfuzzylite/badge.svg?branch=main)](
https://coveralls.io/github/fuzzylite/pyfuzzylite?branch=main)

[development branch](https://github.com/fuzzylite/pyfuzzylite/tree/development)
[![Build](
https://github.com/fuzzylite/pyfuzzylite/actions/workflows/build.yml/badge.svg?branch=development)](
https://github.com/fuzzylite/pyfuzzylite/actions/workflows/build.yml)
[![Coverage Status](
https://coveralls.io/repos/github/fuzzylite/pyfuzzylite/badge.svg?branch=development)](
https://coveralls.io/github/fuzzylite/pyfuzzylite?branch=development)

***

## <a name="fuzzylite">FuzzyLite</a>
Expand Down Expand Up @@ -183,7 +174,6 @@ engine = fl.Engine(

All contributions are welcome, provided they follow the following guidelines:

- Pull requests are made to the [development](https://github.com/fuzzylite/pyfuzzylite/tree/development) branch
- Source code is consistent with standards in the library
- Contribution is properly documented and tested, raising issues where appropriate
- Contribution is licensed under the FuzzyLite License
Expand Down