Skip to content

Commit

Permalink
merge PR #125 inclusion of global rules
Browse files Browse the repository at this point in the history
  • Loading branch information
dbscoach authored Nov 27, 2024
2 parents e0fdf6d + 4b48d50 commit 245e2cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ jobs:
name: build
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- name: build the rules
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "general-rules"]
path = general-rules
url = [email protected]:robocup-junior/general-rules.git
1 change: 1 addition & 0 deletions general-rules
Submodule general-rules added at b188a0
5 changes: 3 additions & 2 deletions preamble.tex
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
\fancyhf{}
\fancyfoot[L]{\textit{Draft rules as of \today}}
\fancyfoot[R]{Page \textbf{\thepage} of \textbf{\pageref{LastPage}}}
\fancyhead[R]{\includegraphics[width=8cm]{media/image15.png}}
}

\title{\vspace{-5ex}RoboCupJunior Soccer Rules 2025\vspace{-5ex}}
Expand All @@ -101,8 +102,8 @@


\begin{document}
\maketitle
\thispagestyle{firststyle}
\maketitle

\begin{center}
\begin{tabular}{cc}
Expand Down Expand Up @@ -134,4 +135,4 @@
\end{tabular}
\end{center}

\vspace{20pt}
\vspace{20pt}
5 changes: 4 additions & 1 deletion rules.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif::basebackend-html[]
:icons: font
:numbered:

These are the Soccer rules for RoboCupJunior 2024. They are released
These are the Soccer rules for RoboCupJunior 2025. They are released
by the RoboCupJunior Soccer League Committee. The English version of these
rules has priority over any translations.

Expand Down Expand Up @@ -78,6 +78,9 @@ organizer of your regional RoboCupJunior competition and ask them about_ <<entry
Unless specified otherwise, all parts of these rules are released under the
terms of the Creative Commons Attribution-ShareAlike License.

[[general-rules]]
include::general-rules/general-rules.adoc[]

[discrete]
=== Changes from the 2024 RoboCupJunior Soccer Rules

Expand Down

0 comments on commit 245e2cb

Please sign in to comment.