Skip to content

Commit 293d287

Browse files
committed
moved version of idf additional tools to env variables
1 parent 5fd6d37 commit 293d287

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

.github/workflows/build_and_run_esp_usb_test_apps.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
container: espressif/idf:${{ matrix.idf_ver }}
1717
env:
18+
ESP_USB_PATH: esp-usb
1819
ESP_USB_MANIFEST: esp-usb/.build-test-rules.yml
1920
ESP_TINYUSB_TEST_APPS: esp-usb/device/esp_tinyusb/test_apps
2021
steps:
@@ -33,8 +34,8 @@ jobs:
3334
export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
3435
export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
3536
python .github/ci/override_managed_component.py tinyusb . ${{ env.ESP_TINYUSB_TEST_APPS }}/*/
36-
idf-build-apps find --paths ${{ env.ESP_TINYUSB_TEST_APPS }}/ --recursive --target all --manifest-rootpath ${{ env.ESP_USB_MANIFEST }}
37-
idf-build-apps build --paths ${{ env.ESP_TINYUSB_TEST_APPS }}/ --recursive --target all --manifest-rootpath ${{ env.ESP_USB_MANIFEST }}
37+
idf-build-apps find --paths ${{ env.ESP_TINYUSB_TEST_APPS }}/ --recursive --target all --manifest-files ${{env.ESP_USB_MANIFEST}} --manifest-rootpath ${{ env.ESP_USB_PATH }}
38+
idf-build-apps build --paths ${{ env.ESP_TINYUSB_TEST_APPS }}/ --recursive --target all --manifest-files ${{env.ESP_USB_MANIFEST}} --manifest-rootpath ${{ env.ESP_USB_PATH }}
3839
- uses: actions/upload-artifact@v4
3940
with:
4041
name: usb_test_app_bin_${{ matrix.idf_ver }}

.github/workflows/build_and_run_idf_examples.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ jobs:
1313
fail-fast: false
1414
runs-on: ubuntu-latest
1515
container: espressif/idf:${{ matrix.idf_ver }}
16+
env:
17+
compot_ver: "2.4.3"
18+
idf_build_apps_ver: "2.13.1"
1619
steps:
1720
- uses: actions/checkout@v4
1821
- name: Install Python dependencies
1922
shell: bash
2023
run: |
2124
. ${IDF_PATH}/export.sh
22-
pip install --no-cache-dir idf-component-manager>=2.1.2 idf-build-apps==2.4.3 pyyaml --upgrade
25+
pip install --no-cache-dir idf-component-manager>=${{ env.compot_ver }} idf-build-apps==${{ env.idf_build_apps_ver }} pyyaml --upgrade
2326
- name: Build Network USB related examples
2427
shell: bash
2528
run: |
@@ -28,8 +31,8 @@ jobs:
2831
export MANIFEST_PATH="${IDF_PATH}/examples/network"
2932
export MANIFEST_FILE="${IDF_PATH}/examples/network/.build-test-rules.yml"
3033
python .github/ci/override_managed_component.py tinyusb . ${EXAMPLES_PATH}
31-
idf-build-apps find --paths ${EXAMPLES_PATH}/ --target esp32s2 --manifest-file ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
32-
idf-build-apps build --paths ${EXAMPLES_PATH}/ --target esp32s2 --manifest-file ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
34+
idf-build-apps find --paths ${EXAMPLES_PATH}/ --target esp32s2 --manifest-files ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
35+
idf-build-apps build --paths ${EXAMPLES_PATH}/ --target esp32s2 --manifest-files ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
3336
- name: Build USB Device examples
3437
shell: bash
3538
run: |
@@ -38,8 +41,8 @@ jobs:
3841
export MANIFEST_PATH="${IDF_PATH}/examples/peripherals/usb"
3942
export MANIFEST_FILE="${IDF_PATH}/examples/peripherals/.build-test-rules.yml"
4043
python .github/ci/override_managed_component.py tinyusb . ${EXAMPLES_PATH}/tusb_*
41-
idf-build-apps find --path ${EXAMPLES_PATH}/ --recursive --target esp32s2 --manifest-file ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
42-
idf-build-apps build --path ${EXAMPLES_PATH}/ --recursive --target esp32s2 --manifest-file ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
44+
idf-build-apps find --path ${EXAMPLES_PATH}/ --recursive --target all --manifest-files ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
45+
idf-build-apps build --path ${EXAMPLES_PATH}/ --recursive --target all --manifest-files ${MANIFEST_FILE} --manifest-rootpath ${MANIFEST_PATH}
4346
- uses: actions/upload-artifact@v4
4447
with:
4548
# We upload only the USB Device example binaries to run them on the target

.github/workflows/build_iot_examples.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
container: espressif/idf:${{ matrix.idf_ver }}
1616
env:
17-
ESP_IOT_PATH: esp-iot-solution
18-
MANIFEST_PATH: esp-iot-solution/examples/.build-rules.yml
19-
EXAMPLE_PATH: esp-iot-solution/examples/usb/device/${{ matrix.name }}
17+
COMPOT_VER: "2.4.3"
18+
IDF_BUILD_APPS_VER: "2.13.1"
19+
TARGET_PATH: esp-iot-solution
20+
TARGET_MANIFEST_PATH: esp-iot-solution/examples/.build-rules.yml
21+
TARGET_EXAMPLES_PATH: esp-iot-solution/examples/usb/device/${{ matrix.name }}
2022
steps:
2123
- uses: actions/checkout@v4
2224
with:
@@ -28,7 +30,7 @@ jobs:
2830
shell: bash
2931
run: |
3032
. ${IDF_PATH}/export.sh
31-
pip install --no-cache-dir idf-component-manager>=2.1.2 idf-build-apps==2.4.3 pyyaml --upgrade
32-
python .github/ci/override_managed_component.py tinyusb . ${{ env.EXAMPLE_PATH }}/
33-
idf-build-apps find --paths ${{ env.EXAMPLE_PATH }} --target all --manifest-file ${{ env.MANIFEST_PATH }} --manifest-rootpath ${{ env.ESP_IOT_PATH }}
34-
idf-build-apps build --paths ${{ env.EXAMPLE_PATH }} --target all --manifest-file ${{ env.MANIFEST_PATH }} --manifest-rootpath ${{ env.ESP_IOT_PATH }}
33+
pip install --no-cache-dir idf-component-manager>=${{ env.COMPOT_VER }} idf-build-apps==${{ env.IDF_BUILD_APPS_VER }} pyyaml --upgrade
34+
python .github/ci/override_managed_component.py tinyusb . ${{ env.TARGET_EXAMPLES_PATH }}/
35+
idf-build-apps find --paths ${{ env.TARGET_EXAMPLES_PATH }} --target all --manifest-file ${{ env.TARGET_MANIFEST_PATH }} --manifest-rootpath ${{ env.TARGET_PATH }}
36+
idf-build-apps build --paths ${{ env.TARGET_EXAMPLES_PATH }} --target all --manifest-file ${{ env.TARGET_MANIFEST_PATH }} --manifest-rootpath ${{ env.TARGET_PATH }}

0 commit comments

Comments
 (0)