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.

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

Check that version.py is updated on merges to master #476

Merged
merged 3 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .github/workflows/require_release_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@ jobs:
run: |
echo "ERROR: You can only merge to master from dev. Contributors should point their PRs to the dev branch."
exit 1

- uses: actions/checkout@v3
if: github.base_ref == 'master'
with:
fetch-depth: 0

- name: Check version.py
if: github.base_ref == 'master'
run: |
git diff --name-only origin/master | grep -q version.py || (echo "Need to change version for pushes to master!" && exit 1)
2 changes: 1 addition & 1 deletion data/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from data import status
from data.config.color import Color
from data.config.layout import Layout
from data.time import TIME_FORMAT_12H, TIME_FORMAT_24H
from data.time_formats import TIME_FORMAT_12H, TIME_FORMAT_24H
from utils import deep_update

SCROLLING_SPEEDS = [0.3, 0.2, 0.1, 0.075, 0.05, 0.025, 0.01]
Expand Down
2 changes: 1 addition & 1 deletion data/scoreboard/pregame.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import tzlocal

from data.game import Game
from data.time import TIME_FORMAT_12H
from data.time_formats import TIME_FORMAT_12H

PITCHER_TBD = "TBD"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion renderers/offday.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import PIL.Image

from data.time import TIME_FORMAT_12H
from data.time_formats import TIME_FORMAT_12H
from data.config.color import Color
from data.config.layout import Layout
from data.headlines import Headlines
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SCRIPT_NAME = "MLB LED Scoreboard"
SCRIPT_VERSION = "6.3.2"
SCRIPT_VERSION = "6.3.4"


if __name__ == "__main__":
Expand Down