Skip to content

Commit 72173e1

Browse files
committed
github: use ubuntu-20.04 instead of ubuntu-latest
GitHub is currently warning if we use ubuntu-latest. It is probably better to be explicit anyway. ev3dev-stretch needs to build it's own mpy-cross now since the Debian Stretch docker image can't run a binary built on Ubuntu 20.04.
1 parent e178c85 commit 72173e1

File tree

6 files changed

+15
-21
lines changed

6 files changed

+15
-21
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
mpy_cross:
1616
name: mpy-cross
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-20.04
1818
steps:
1919
- name: Checkout repo
2020
uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
3232
unix_coverage:
3333
name: unix coverage
3434
needs: mpy_cross
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-20.04
3636
env:
3737
PYBRICKS_NO_REDIRECT_STDOUT: 1
3838
steps:
@@ -65,8 +65,7 @@ jobs:
6565

6666
ev3dev_stretch:
6767
name: ev3dev-stretch
68-
needs: mpy_cross
69-
runs-on: ubuntu-latest
68+
runs-on: ubuntu-20.04
7069
steps:
7170
- name: Docker login
7271
uses: azure/docker-login@v1
@@ -83,17 +82,12 @@ jobs:
8382
with:
8483
submodules: true
8584
fetch-depth: 0
86-
- name: Download mpy-cross
87-
uses: actions/download-artifact@v1
88-
with:
89-
name: mpy-cross
90-
path: micropython/mpy-cross
91-
- name: Fix file permission
92-
run: chmod +x micropython/mpy-cross/mpy-cross
9385
- name: Create docker container
9486
run: bricks/ev3dev/docker/setup.sh armel
9587
- name: Build
96-
run: docker exec --tty pybricks-ev3dev_armel make
88+
run: |
89+
docker exec --tty pybricks-ev3dev_armel make -C ../../micropython/mpy-cross CROSS_COMPILE=
90+
docker exec --tty pybricks-ev3dev_armel make
9791
- name: Test
9892
if: ${{ success() }}
9993
run: |
@@ -112,7 +106,7 @@ jobs:
112106
ev3dev_bionic:
113107
name: ev3dev-bionic
114108
needs: mpy_cross
115-
runs-on: ubuntu-latest
109+
runs-on: ubuntu-20.04
116110
env:
117111
CROSS_COMPILE: ""
118112
steps:
@@ -157,7 +151,7 @@ jobs:
157151

158152
cross_compiler:
159153
name: download cross-compiler
160-
runs-on: ubuntu-latest
154+
runs-on: ubuntu-20.04
161155
steps:
162156
- name: Check cache
163157
id: check-cache
@@ -179,7 +173,7 @@ jobs:
179173
matrix:
180174
hub: [cityhub, movehub, nxt, primehub, technichub]
181175
needs: [cross_compiler, mpy_cross]
182-
runs-on: ubuntu-latest
176+
runs-on: ubuntu-20.04
183177
steps:
184178
- name: Install cross-compiler
185179
uses: actions/cache@v1
@@ -242,7 +236,7 @@ jobs:
242236
debug:
243237
name: debug firmware
244238
needs: [cross_compiler, mpy_cross]
245-
runs-on: ubuntu-latest
239+
runs-on: ubuntu-20.04
246240
steps:
247241
- name: Install cross-compiler
248242
uses: actions/cache@v1

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
format:
2727
name: Check code formatting
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-20.04
2929
steps:
3030
- name: Install uncrustify
3131
run: |

.github/workflows/npm-firmware.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
npm_firmware:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
defaults:
1212
run:
1313
working-directory: npm/firmware

.github/workflows/npm-mpy-cross.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
npm_mpy_cross:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
defaults:
1212
run:
1313
working-directory: npm/mpy-cross

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
jobs:
1212
upload_release:
1313
name: Upload Release Assets
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- name: Check cache
1717
id: check-cache

micropython

0 commit comments

Comments
 (0)