Skip to content

Commit 09adb24

Browse files
committed
slightly refactor ci
1 parent 8096c94 commit 09adb24

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ jobs:
152152
- name: Set matrix
153153
id: set-matrix
154154
working-directory: tools
155+
run: python3 -u ci_set_matrix.py
155156
env:
156157
BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
157158
HEAD_SHA: ${{ github.event.after }}
158159
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
159160
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
160-
run: python3 -u ci_set_matrix.py
161161

162162

163163
mpy-cross-mac:
@@ -420,14 +420,15 @@ jobs:
420420
path: ${{ github.workspace }}/.idf_tools
421421
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
422422
- name: Clone IDF submodules
423-
run: |
424-
(cd $IDF_PATH && git submodule update --init)
423+
run: git submodule update --init $IDF_PATH
425424
env:
426425
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
427426
- name: Install IDF tools
428427
run: |
428+
echo "Installing ESP-IDF tools"
429429
$IDF_PATH/tools/idf_tools.py --non-interactive install required
430430
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake
431+
echo "Installing Python environment and packages"
431432
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
432433
rm -rf $IDF_TOOLS_PATH/dist
433434
env:
@@ -445,7 +446,6 @@ jobs:
445446
run: |
446447
source $IDF_PATH/export.sh
447448
gcc --version
448-
xtensa-esp32s2-elf-gcc --version
449449
python3 --version
450450
ninja --version
451451
cmake --version
@@ -479,6 +479,7 @@ jobs:
479479
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
480480
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
481481

482+
482483
build-aarch:
483484
runs-on: ubuntu-20.04
484485
needs: test

0 commit comments

Comments
 (0)