Skip to content

Commit 47feb4d

Browse files
committed
Merge branch 'ci/hw_fix'
2 parents 575a415 + 87645b8 commit 47feb4d

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

.github/workflows/build_tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ jobs:
5454
/*
5555
!.github
5656
57+
- name: Install APT dependencies
58+
if: ${{ steps.check-build.outputs.enabled == 'true' }}
59+
uses: awalsh128/[email protected]
60+
with:
61+
packages: curl jq lsb_release
62+
version: 1.0
63+
5764
# To avoid giving unknown scripts elevated permissions, download them from the master branch
5865
- name: Get CI scripts from master
5966
if: ${{ steps.check-build.outputs.enabled == 'true' }}

.github/workflows/hw.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ jobs:
1919
env:
2020
id: ${{ github.event.pull_request.number || github.ref }}-${{ github.event.pull_request.head.sha || github.sha }}-${{ inputs.chip }}-${{ inputs.type }}
2121
container:
22-
image: python:3.10.1-bullseye
22+
image: ubuntu:latest
2323
options: --privileged
24+
defaults:
25+
run:
26+
shell: bash
2427
steps:
2528
- name: Check if already built
2629
if: ${{ github.event.pull_request.number != null }}
@@ -64,13 +67,12 @@ jobs:
6467
cd .github
6568
curl https://codeload.github.com/${{ github.repository }}/tar.gz/master | tar -xz --strip=2 arduino-esp32-master/.github
6669
67-
# setup-python currently only works on ubuntu images
68-
# - uses: actions/setup-python@v5
69-
# if: ${{ steps.check-tests.outputs.enabled == 'true' }}
70-
# with:
71-
# cache-dependency-path: tests/requirements.txt
72-
# cache: 'pip'
73-
# python-version: '3.10.1'
70+
- uses: actions/setup-python@v5
71+
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
72+
with:
73+
cache-dependency-path: tests/requirements.txt
74+
cache: 'pip'
75+
python-version: '3.x'
7476

7577
- name: Install dependencies
7678
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
@@ -79,9 +81,9 @@ jobs:
7981
pip install -r tests/requirements.txt --extra-index-url https://dl.espressif.com/pypi
8082
8183
- name: Get binaries
84+
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
8285
id: cache-build-binaries
8386
uses: actions/cache/restore@v4
84-
if: ${{ steps.check-tests.outputs.enabled == 'true' }}
8587
with:
8688
fail-on-cache-miss: true
8789
key: tests-${{ env.id }}-bin

0 commit comments

Comments
 (0)