Skip to content

Commit 7e5e482

Browse files
Merge branch 'fix/update_actions_v4' into 'master'
PR: workflows: fix update actions to v4 Closes IDFGH-14621 See merge request espressif/esp-mqtt!228
2 parents cea7e95 + 06b8923 commit 7e5e482

File tree

4 files changed

+8
-22
lines changed

4 files changed

+8
-22
lines changed

.github/workflows/build-app.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
3232
apt-get install -y nodejs
3333
- name: Checkout esp-mqtt
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
- name: ccache
3636
uses: hendrikmuhs/[email protected]
3737
with:
@@ -46,7 +46,7 @@ jobs:
4646
cp -r . $IDF_PATH/components/mqtt/esp-mqtt
4747
IDF_CCACHE_ENABLE=1 idf-build-apps build --config-file ci/idf_build_apps.toml -p ${{inputs.app_path}} -t ${{inputs.target}}
4848
- name: Upload files to artifacts for run-target job
49-
uses: actions/upload-artifact@v3
49+
uses: actions/upload-artifact@v4
5050
if: ${{inputs.upload_artifacts}}
5151
with:
5252
name: mqtt_bin_${{inputs.target}}_${{ inputs.idf_version }}_${{ inputs.app_name }}

.github/workflows/mqtt__host-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
COMP_DIR: components/mqtt/esp-mqtt
1919
steps:
2020
- name: Checkout esp-mqtt
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222
- name: Build and Test
2323
shell: bash
2424
run: |
@@ -66,7 +66,7 @@ jobs:
6666
- name: Write to Job Summary
6767
run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
6868
- name: Upload artifacts
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
if: always()
7171
with:
7272
name: docs_gcovr

.github/workflows/run-on-target.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
ip route
4040
echo runner_ip ="`ip -4 addr show eth0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}'`" >> "$GITHUB_OUTPUT"
4141
- name: Checkout IDF ${{inputs.idf_version}}
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
repository: espressif/esp-idf
4545
path: ${{env.IDF_PATH}}
@@ -49,15 +49,15 @@ jobs:
4949
PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi/"
5050
run: |
5151
pip install --only-binary cryptography -r ${{env.IDF_PATH}}/tools/requirements/requirements.pytest.txt
52-
- uses: actions/download-artifact@v3
52+
- uses: actions/download-artifact@v4
5353
with:
5454
name: mqtt_bin_${{inputs.target}}_${{ inputs.idf_version }}_${{ inputs.app_name }}
5555
path: build
5656

5757
- name: Run ${{inputs.app_name}} application on ${{inputs.target}}
5858
run: |
5959
python -m pytest ${{inputs.app_path}} --log-cli-level DEBUG --app-path . --junit-xml=./results_${{inputs.app_name}}_${{inputs.idf_version}}.xml --target=${{inputs.target}}
60-
- uses: actions/upload-artifact@v3
60+
- uses: actions/upload-artifact@v4
6161
if: always()
6262
with:
6363
name: results_${{inputs.app_name}}_${{inputs.idf_version}}.xml

.github/workflows/test-examples.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,7 @@ jobs:
2828
matrix:
2929
idf_version: ["release-v5.0", "release-v5.1", "latest"]
3030
target: ["esp32s2", "esp32c3", "esp32s3"]
31-
example: [{name: ssl_psk, path: "mqtt/ssl_psk"}]
32-
uses: "./.github/workflows/build-app.yml"
33-
with:
34-
idf_version: ${{matrix.idf_version}}
35-
target: ${{matrix.target}}
36-
app_name: ${{matrix.example.name}}
37-
app_path: $IDF_PATH/examples/protocols/${{matrix.example.path}}
38-
39-
build-only-ds-example:
40-
name: Build Only Apps
41-
strategy:
42-
matrix:
43-
idf_version: ["release-v5.0", "release-v5.1", "latest"]
44-
target: ["esp32s2", "esp32c3", "esp32s3"]
45-
example: [{name: ssl_ds, path: "mqtt/ssl_ds"}, {name: ssl_psk, path: "mqtt/ssl_psk"}]
31+
example: [{name: ssl_psk, path: "mqtt/ssl_psk"}, {name: ssl_ds, path: "mqtt/ssl_ds"}]
4632
uses: "./.github/workflows/build-app.yml"
4733
with:
4834
idf_version: ${{matrix.idf_version}}

0 commit comments

Comments
 (0)