Skip to content

Commit 1bcea60

Browse files
committed
.github: Add EV3 target.
This is now an embedded build like all the others, so can be treated the same way. Also add a few missing NXT entries.
1 parent e629d3e commit 1bcea60

File tree

9 files changed

+17
-8
lines changed

9 files changed

+17
-8
lines changed

.github/build-each-commit.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
# update only required submodules
5959
pybricks.git.submodule("update", "--init", "micropython")
60-
if args.hub in ["cityhub", "movehub", "technichub", "primehub", "essentialhub"]:
60+
if args.hub in ["cityhub", "movehub", "technichub", "primehub", "essentialhub", "nxt", "ev3"]:
6161
pybricks.submodule("micropython").module().git.submodule(
6262
"update", "--init", "lib/micropython-lib"
6363
)
@@ -77,6 +77,7 @@
7777
"clean",
7878
"build/firmware-base.bin",
7979
"all",
80+
"-j"
8081
]
8182
)
8283

.github/build-missing-commits.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
PYBRICKS_BRANCH = "origin/master"
2222

23-
HUBS = ["movehub", "cityhub", "technichub", "primehub", "essentialhub", "nxt"]
23+
HUBS = ["movehub", "cityhub", "technichub", "primehub", "essentialhub", "nxt", "ev3"]
2424

2525
GITHUB_RUN_NUMBER = os.environ.get("GITHUB_RUN_NUMBER")
2626

@@ -114,6 +114,7 @@
114114
os.path.join(PYBRICKS_PATH, "bricks", target),
115115
"clean",
116116
"build/firmware-base.bin",
117+
"-j"
117118
]
118119
)
119120
for target in hubs

.github/build-stats-web.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Number of digits of hash to display
1919
HASH_SIZE = 8
2020

21-
HUBS = ["cityhub", "technichub", "movehub", "primehub", "essentialhub", "nxt"]
21+
HUBS = ["cityhub", "technichub", "movehub", "primehub", "essentialhub", "nxt", "ev3"]
2222

2323
GITHUB_REPO_URL = "https://github.com/pybricks/pybricks-micropython"
2424

.github/download-commit-metadata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"primehub",
2828
"essentialhub",
2929
"nxt",
30+
"ev3",
3031
]
3132

3233
QUERY = """query {

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ jobs:
8888
strategy:
8989
fail-fast: false
9090
matrix:
91-
hub: [cityhub, essentialhub, movehub, nxt, primehub, technichub]
91+
hub: [cityhub, essentialhub, movehub, nxt, primehub, technichub, ev3]
9292
needs: [mpy_cross]
9393
runs-on: ubuntu-22.04
9494
steps:
9595
- name: Install cross-compiler
96-
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi
96+
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi u-boot-tools
9797
- name: Checkout repo
9898
uses: actions/checkout@v4
9999
with:

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Install cross-compiler
20-
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi
20+
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi u-boot-tools
2121
- name: Checkout code
2222
uses: actions/checkout@v4
2323
with:
@@ -33,6 +33,8 @@ jobs:
3333
make $MAKEOPTS -C bricks/technichub
3434
make $MAKEOPTS -C bricks/primehub
3535
make $MAKEOPTS -C bricks/essentialhub
36+
make $MAKEOPTS -C bricks/nxt
37+
make $MAKEOPTS -C bricks/ev3
3638
- name: Get tag
3739
run: echo "GITHUB_TAG=${GITHUB_REF#*refs/tags/}" >> $GITHUB_ENV
3840
- name: Create Release and Upload Assets
@@ -45,7 +47,7 @@ jobs:
4547
else
4648
PRERELEASE_FLAG=""
4749
fi
48-
HUBS="movehub cityhub technichub primehub essentialhub"
50+
HUBS="movehub cityhub technichub primehub essentialhub nxt ev3"
4951
for HUB in $HUBS; do
5052
NEW_FILENAME="./bricks/$HUB/build/pybricks-$HUB-${{ env.GITHUB_TAG }}.zip"
5153
mv "./bricks/$HUB/build/firmware.zip" "$NEW_FILENAME"

.github/workflows/stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Install cross-compiler
16-
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi
16+
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi u-boot-tools
1717
- name: Checkout code
1818
uses: actions/checkout@v4
1919
with:

npm/firmware/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ export const zipFileNameMap: ReadonlyMap<HubType, string> = new Map([
6969
[HubType.TechnicHub, 'technichub.zip'],
7070
[HubType.PrimeHub, 'primehub.zip'],
7171
[HubType.EssentialHub, 'essentialhub.zip'],
72+
[HubType.NXT, 'nxt.zip'],
73+
[HubType.EV3, 'ev3.zip'],
7274
]);
7375

7476
/**

npm/firmware/use_local_build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ cp ../../bricks/technichub/build/firmware.zip build/technichub.zip
44
cp ../../bricks/movehub/build/firmware.zip build/movehub.zip
55
cp ../../bricks/primehub/build/firmware.zip build/primehub.zip
66
cp ../../bricks/essentialhub/build/firmware.zip build/essentialhub.zip
7+
cp ../../bricks/nxt/build/firmware.zip build/nxt.zip
8+
cp ../../bricks/ev3/build/firmware.zip build/ev3.zip

0 commit comments

Comments
 (0)