slightly refactor ci

This commit is contained in:
MicroDev 2023-01-07 18:40:18 +05:30
parent 8096c94e1b
commit 09adb24284
No known key found for this signature in database
GPG Key ID: 2C0867BE60967730

View File

@ -152,12 +152,12 @@ jobs:
- name: Set matrix - name: Set matrix
id: set-matrix id: set-matrix
working-directory: tools working-directory: tools
run: python3 -u ci_set_matrix.py
env: env:
BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }} BASE_SHA: ${{ steps.deepen-and-convert-depth-to-sha.outputs.commit }}
HEAD_SHA: ${{ github.event.after }} HEAD_SHA: ${{ github.event.after }}
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }} CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }} LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
run: python3 -u ci_set_matrix.py
mpy-cross-mac: mpy-cross-mac:
@ -420,14 +420,15 @@ jobs:
path: ${{ github.workspace }}/.idf_tools path: ${{ github.workspace }}/.idf_tools
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404 key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
- name: Clone IDF submodules - name: Clone IDF submodules
run: | run: git submodule update --init $IDF_PATH
(cd $IDF_PATH && git submodule update --init)
env: env:
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
- name: Install IDF tools - name: Install IDF tools
run: | run: |
echo "Installing ESP-IDF tools"
$IDF_PATH/tools/idf_tools.py --non-interactive install required $IDF_PATH/tools/idf_tools.py --non-interactive install required
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
echo "Installing Python environment and packages"
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
rm -rf $IDF_TOOLS_PATH/dist rm -rf $IDF_TOOLS_PATH/dist
env: env:
@ -445,7 +446,6 @@ jobs:
run: | run: |
source $IDF_PATH/export.sh source $IDF_PATH/export.sh
gcc --version gcc --version
xtensa-esp32s2-elf-gcc --version
python3 --version python3 --version
ninja --version ninja --version
cmake --version cmake --version
@ -479,6 +479,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
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')) 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'))
build-aarch: build-aarch:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: test needs: test