Skip to content

Commit

Permalink
merge the updated develop branch to test before merging it into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Bender committed Feb 23, 2021
1 parent 9dbdc91 commit bcdce48
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion py25/bacpypes/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Project Metadata
#

__version__ = '0.18.3'
__version__ = '0.18.4'
__author__ = 'Joel Bender'
__email__ = '[email protected]'

Expand Down
2 changes: 1 addition & 1 deletion py27/bacpypes/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Project Metadata
#

__version__ = '0.18.3'
__version__ = '0.18.4'
__author__ = 'Joel Bender'
__email__ = '[email protected]'

Expand Down
2 changes: 1 addition & 1 deletion py34/bacpypes/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Project Metadata
#

__version__ = '0.18.3'
__version__ = '0.18.4'
__author__ = 'Joel Bender'
__email__ = '[email protected]'

Expand Down

1 comment on commit bcdce48

@ChristianTremblay
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would merge this branch into develop. This will add the folder .github\workflows that contains the configuration yaml file build.yml.
This way, tests will be conducted everytime there is a push to develop.

Minor change required to the file

on:
  push:
    branches: [ develop, master ]
  pull_request:
    branches: [ develop, master ]

Will trigger test on those 2 branches, and PR.

This branch could be deleted then

Please sign in to comment.