Compare commits
5 Commits
5375ab41a4
...
draft2026
| Author | SHA1 | Date | |
|---|---|---|---|
|
880f6f97e8
|
|||
|
0fad347372
|
|||
|
55554f25c0
|
|||
|
a4d575c07e
|
|||
|
f0fbf8662b
|
4
.github/workflows/ci-docs.yml
vendored
4
.github/workflows/ci-docs.yml
vendored
@@ -2,6 +2,10 @@ name: CI - Docs build check
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "draft*"
|
||||
- "rc*"
|
||||
- "v*"
|
||||
branches:
|
||||
- main
|
||||
- draft
|
||||
|
||||
16
.github/workflows/release.yml
vendored
16
.github/workflows/release.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: Build & publish docs (rc + release)
|
||||
name: Build & publish
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -87,6 +87,7 @@ jobs:
|
||||
|
||||
OUT_DIR="${RUNNER_TEMP}/pandoc"
|
||||
OUT_FILE="${GITHUB_REF_NAME}-${SHORT_SHA}.docx"
|
||||
PLAYING_RULES_OUT_FILE="${GITHUB_REF_NAME}-${SHORT_SHA}-playing-rules.docx"
|
||||
echo "SHORT_SHA=`echo ${SHORT_SHA}`" >> $GITHUB_ENV
|
||||
|
||||
mkdir -p "${OUT_DIR}"
|
||||
@@ -109,6 +110,16 @@ jobs:
|
||||
|
||||
echo "Pandoc output written to ${OUT_DIR}/${OUT_FILE}"
|
||||
|
||||
echo "Generating ${PLAYING_RULES_OUT_FILE}"
|
||||
|
||||
pandoc \
|
||||
docs/03-playing-rules.md \
|
||||
--shift-heading-level-by=-1 \
|
||||
--number-sections \
|
||||
-o "${OUT_DIR}/${PLAYING_RULES_OUT_FILE}"
|
||||
|
||||
echo "Pandoc output written to ${OUT_DIR}/${PLAYING_RULES_OUT_FILE}"
|
||||
|
||||
- name: Zip offline site
|
||||
run: |
|
||||
set -euo pipefail
|
||||
@@ -140,6 +151,7 @@ jobs:
|
||||
files: |
|
||||
${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip
|
||||
${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}.docx
|
||||
${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}-playing-rules.docx
|
||||
|
||||
- name: Publish release
|
||||
if: startsWith(github.ref_name, 'v')
|
||||
@@ -150,6 +162,8 @@ jobs:
|
||||
body_path: ${{ runner.temp }}/release-notes.md
|
||||
files: |
|
||||
${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip
|
||||
${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}.docx
|
||||
${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}-playing-rules.docx
|
||||
|
||||
- name: Checkout gh-pages branch
|
||||
uses: actions/checkout@v4
|
||||
|
||||
19
README.md
19
README.md
@@ -45,6 +45,23 @@ MkDocs serves the site locally and watches the Markdown files under `docs/` for
|
||||
- Use the local preview server when editing headings, internal links, or cross-references.
|
||||
- Update `tools/spellcheck/baseball-words.txt` when league-specific terminology is flagged by CSpell.
|
||||
|
||||
## Amendment Flow
|
||||
|
||||
Amendments move through three review stages before publication:
|
||||
|
||||
1. Draft amendments are prepared on the `draft` branch. Use this branch for active editing, internal review, and early validation.
|
||||
2. Drafts may be prereleased for review by pushing a `draft*` tag. The draft prerelease provides a reviewable GitHub release and deploys the draft preview site at `/draft/`.
|
||||
3. When the draft is ready for formal consideration, merge it into `release-candidate` with a merge commit. The merge commit preserves the point at which the draft moved into release-candidate review.
|
||||
4. Release candidates may be prereleased for review by pushing an `rc*` tag. The release-candidate prerelease provides the version to be voted on and deploys the release-candidate preview site at `/rc/`.
|
||||
5. After the amendment is voted on and approved according to the required CMBA process, merge the release candidate into `main`.
|
||||
6. Publish the approved amendment from `main` by pushing a `v*` tag and creating the final GitHub release.
|
||||
|
||||
The final GitHub release is the published record for an approved amendment. It should include:
|
||||
|
||||
- an offline HTML version of the documents
|
||||
- a `.docx` version of the combined bylaws, policy, and playing rules
|
||||
- a `.docx` version of the playing rules only
|
||||
|
||||
## Publishing
|
||||
|
||||
Publishing is driven by GitHub Actions.
|
||||
@@ -67,7 +84,7 @@ It builds both the normal site and an offline site package, then publishes based
|
||||
|
||||
- `draft*`: creates a GitHub prerelease, attaches the offline zip and generated `.docx`, and deploys the preview site to the `gh-pages` branch under `/draft/`
|
||||
- `rc*`: creates a GitHub prerelease, attaches the offline zip and generated `.docx`, and deploys the preview site to the `gh-pages` branch under `/rc/`
|
||||
- `v*`: creates a GitHub release, attaches the offline zip, and deploys the release site to the root of the `gh-pages` branch
|
||||
- `v*`: creates a GitHub release, attaches the release artifacts, and deploys the release site to the root of the `gh-pages` branch
|
||||
|
||||
The GitHub release description is generated from `docs/summary-of-changes.md`. Draft and release-candidate prereleases prepend a short prerelease note before that summary.
|
||||
|
||||
|
||||
@@ -21,6 +21,16 @@ These rules shall *not* incorporate the following rules of Major League Baseball
|
||||
## Pre-Game Meeting
|
||||
Before first pitch, the Managers and the umpire-in-chief shall conduct a pre-game meeting. A Manager may designate a team delegate to attend on the Manager’s behalf. At this meeting, the teams shall exchange lineups and review any applicable ground rules with the umpire.
|
||||
|
||||
## Pre-Game Warmups
|
||||
As a general pre-game guideline, teams should plan for about 20 to 30 minutes of total defensive warmup time (i.e. an infield/outfield routine), counted from when the first team starts, and distributed evenly as practically as possible. The visiting team will usually go first, and the home team will usually take the final turn before the pre-game meeting and first pitch. For fields where a batting cage is available, the team not using the field should make use of the batting cage while the other team finishes its defensive warmups.
|
||||
|
||||
Managers may agree to reverse the order or adjust the timing if that works better for both teams.
|
||||
|
||||
!!! Examples
|
||||
For a game starting at 9:30 am at a field with a batting cage, the visiting team might perform their infield/outfield routine from about 9:00 to 9:15 while the home team uses the batting cage. The teams would then switch, with the home team taking the field from about 9:15 to 9:30 and the visiting team using the cage or bullpen until first pitch.
|
||||
|
||||
For a game starting at 6:15 pm at a field with a batting cage, the home team might start offensive warmups in the batting cage at 6:00 pm. Because there are 15 minutes before first pitch, they take approximately 7.5 minutes for offensive warmups while the visiting team uses the field for their defensive infield/outfield routine. The teams would then switch, with the home team taking the field from about 6:07 to 6:14 and the visiting team using the cage until first pitch.
|
||||
|
||||
## Regulation Games
|
||||
Games played under the auspices of both recognized Managers of the participating teams shall count as official. A regulation game is defined as follows
|
||||
|
||||
|
||||
@@ -35,4 +35,4 @@ The Chicago Metropolitan Baseball Association exists to provide strong amateur b
|
||||
|
||||
## Additional Resources
|
||||
|
||||
- [Summary of High Level Changes for 2026](summary-of-changes.md)
|
||||
- [Summary of Changes](summary-of-changes.md)
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
### Playing Rules
|
||||
|
||||
- Playing Rules now focus on on-field competition only, with administrative topics moved into League Policy.
|
||||
- Pre-game warmup guidance has been added for field sharing, batting cage use, and a suggested 20-to-30-minute overall warmup window counted from when the first team starts.
|
||||
- The Playing Rules expressly incorporate the Official Baseball Rules unless a League exception applies.
|
||||
- The draft clarifies which modern MLB rules are not adopted by description, including limits on position-player pitching, shift restrictions, extra-inning automatic runners, pitch clocks, disengagement limits, the three-batter minimum, per-game mound visit limits, mandatory 18-inch bases, and replay/specialized-equipment rules.
|
||||
- The League now has a clear rule hierarchy: League Policy controls first, then Playing Rules, then incorporated MLB rules.
|
||||
@@ -31,4 +32,4 @@
|
||||
- Regular-season flexibility is preserved through the Expanded Lineup Format, allowing unlimited Extra Hitters, shared batting positions, free defensive substitution, Designated Runners, and Courtesy Runners.
|
||||
- Postseason play is treated more formally through the Restricted Lineup Format, which excludes shared batting positions and uses stricter substitution rules.
|
||||
- Minimum-player rules have been clarified: teams must start when both have one fewer than the required batting positions, short spots are outs, and teams falling below the minimum forfeit.
|
||||
- Collision, injury substitution, Designated Runner, Courtesy Runner, and umpire-dispute rules have been rewritten for clarity and consistency with incorporated baseball rules.
|
||||
- Collision, injury substitution, Designated Runner, Courtesy Runner, and umpire-dispute rules have been rewritten for clarity and consistency with incorporated baseball rules.
|
||||
|
||||
Reference in New Issue
Block a user