From 9ef975c54bdca43b2b77f7a20ab18259d4d0f4d9 Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Tue, 31 Mar 2026 15:14:29 +0200 Subject: [PATCH] ci: Fix idf-ci artifacts path --- .gitlab/ci/test.yml | 2 +- .idf_ci.toml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 3923a21..54c89fc 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -18,7 +18,7 @@ host_tests: coverage_format: cobertura path: "**/coverage.xml" before_script: - - pip install -U gcovr 'idf-ci<1' + - pip install -U gcovr 'idf-ci>=1,<2' script: | set -euo pipefail ORIG_DIR="${CI_PROJECT_DIR:-$(pwd)}" diff --git a/.idf_ci.toml b/.idf_ci.toml index 012d2c5..9a4a319 100644 --- a/.idf_ci.toml +++ b/.idf_ci.toml @@ -1,5 +1,5 @@ # ESP-MQTT idf-ci Configuration -[gitlab.artifacts] +[gitlab.artifacts.native] build_job_filepatterns = [ "**/build*/partition_table/*.bin", "**/build*/bootloader/*.bin", @@ -24,13 +24,13 @@ job_template_jinja = """ timeout: "1h" artifacts: paths: - {%- for path in settings.gitlab.artifacts.build_job_filepatterns %} + {%- for path in settings.gitlab.artifacts.native.build_job_filepatterns %} - "{{ path }}" {%- endfor %} expire_in: "1 week" when: "always" before_script: - - pip install -U 'idf-ci<1' + - pip install -U 'idf-ci>=1,<2' script: | set -euo pipefail ORIG_DIR="${CI_PROJECT_DIR:-$(pwd)}" @@ -65,7 +65,7 @@ job_template_jinja = """ timeout: "1h" artifacts: paths: - {%- for path in settings.gitlab.artifacts.test_job_filepatterns %} + {%- for path in settings.gitlab.artifacts.native.test_job_filepatterns %} - "{{ path }}" {%- endfor %} expire_in: "1 week" @@ -78,7 +78,7 @@ job_template_jinja = """ - pipeline: "$PARENT_PIPELINE_ID" job: "build_test_related_apps{{ settings.gitlab.test_pipeline.parent_pipeline_job_suffix }}" before_script: - - pip install -U 'idf-ci<1' + - pip install -U 'idf-ci>=1,<2' script: - eval pytest $nodes --parallel-count ${CI_NODE_TOTAL:-1}