Skip to content

Commit 35c9df3

Browse files
committed
CI: Try bumping the docker image
1 parent 38b3703 commit 35c9df3

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

.github/workflows/build_test.yml

+8-13
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,8 @@ jobs:
325325
- uses: ./.github/actions
326326

327327
armv7_simd_test:
328-
needs: [smoke_test]
329-
# make sure this (20.04) matches the base docker image (focal) below
330-
runs-on: ubuntu-20.04
328+
# make sure this matches the base docker image below
329+
runs-on: ubuntu-22.04
331330
steps:
332331
- uses: actions/checkout@v3
333332
with:
@@ -343,14 +342,10 @@ jobs:
343342
sudo apt install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
344343
345344
# Keep the `test_requirements.txt` dependency-subset synced
346-
docker run --name the_container --interactive -v /:/host arm32v7/ubuntu:focal /bin/bash -c "
345+
docker run --name the_container --interactive -v /:/host arm32v7/ubuntu:22.04 /bin/bash -c "
347346
apt update &&
348-
DEBIAN_FRONTEND=noninteractive apt install -y git python3.9 python3.9-venv &&
349-
ln -s /usr/bin/python3.9 /usr/bin/pythonx &&
350-
python3.9 -m venv venv &&
351-
source venv/bin/activate &&
352-
pythonx -m pip install --upgrade pip setuptools wheel &&
353-
pythonx -m pip install cython==0.29.30 setuptools\<49.2.0 hypothesis==6.23.3 pytest==6.2.5 'typing_extensions>=4.2.0' &&
347+
apt install -y git python3 python3-pip &&
348+
python3 -m pip install cython==0.29.30 setuptools\<49.2.0 hypothesis==6.23.3 pytest==6.2.5 'typing_extensions>=4.2.0' &&
354349
ln -s /host/lib64 /lib64 &&
355350
ln -s /host/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu &&
356351
ln -s /host/usr/arm-linux-gnueabihf /usr/arm-linux-gnueabihf &&
@@ -369,16 +364,16 @@ jobs:
369364
uname -a &&
370365
gcc --version &&
371366
g++ --version &&
372-
pythonx --version &&
367+
python3 --version &&
373368
git config --global --add safe.directory /numpy
374369
cd /numpy &&
375-
pythonx setup.py install
370+
python3 setup.py install
376371
"
377372
docker commit the_build the_build
378373
- name: Run SIMD Tests
379374
run: |
380375
docker run --rm --interactive -v $(pwd):/numpy the_build /bin/bash -c "
381-
cd /numpy && pythonx runtests.py -n -v -- -k test_simd
376+
cd /numpy && python3 runtests.py -n -v -- -k test_simd
382377
"
383378
384379
sde_simd_avx512_test:

0 commit comments

Comments
 (0)