mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'ci/use-latest-common-repo' into 'master'
ci: use latest ci/actions/common repo See merge request espressif/esp-idf!51759
This commit is contained in:
+3
-31
@@ -2,36 +2,15 @@
|
|||||||
|
|
||||||
include:
|
include:
|
||||||
- project: "ci/actions/common"
|
- project: "ci/actions/common"
|
||||||
ref: "v2"
|
|
||||||
file:
|
file:
|
||||||
- "templates/stable/default-workflow.yml"
|
- "templates/stable/default-workflow.yml"
|
||||||
- "templates/idf/pre_check.yml"
|
- "templates/idf/v2/pre_check.yml"
|
||||||
|
- "templates/idf/pre-commit.yml"
|
||||||
- "templates/idf/build.yml"
|
- "templates/idf/build.yml"
|
||||||
- "templates/idf/deploy-github.yml"
|
- "templates/idf/deploy-github.yml"
|
||||||
- "templates/idf/deploy-docs.yml"
|
- "templates/idf/deploy-docs.yml"
|
||||||
- "templates/idf/integration-test.yml"
|
- "templates/idf/integration-test.yml"
|
||||||
- project: "ci/actions/common"
|
- "templates/idf/sync-files.yml"
|
||||||
ref: "v2"
|
|
||||||
file: "templates/idf/sync-files.yml"
|
|
||||||
inputs:
|
|
||||||
job_name: "sync-pre-commit-config"
|
|
||||||
remote_repo_url: "https://__token__:${CI_SYNC_REPO_TOKEN}@${CI_SERVER_FQDN}/ci/images.git"
|
|
||||||
ref_name: "ci/sync_idf_pre_commit_config"
|
|
||||||
file_mappings:
|
|
||||||
- ".pre-commit-config.yaml:pre-commit/idf/.pre-commit-config.v6.2.yaml"
|
|
||||||
changes:
|
|
||||||
- ".pre-commit-config.yaml"
|
|
||||||
- project: "ci/actions/common"
|
|
||||||
ref: "v2"
|
|
||||||
file: "templates/idf/sync-files.yml"
|
|
||||||
inputs:
|
|
||||||
job_name: "sync-wifi-regulatory"
|
|
||||||
remote_repo_url: "https://__token__:${QACI_RW_TOKEN}@${CI_SERVER_FQDN}/qa/ats-n2.git"
|
|
||||||
ref_name: "ci/sync_wifi_regulatory"
|
|
||||||
file_mappings:
|
|
||||||
- "components/esp_wifi/regulatory/esp_wifi_regulatory.txt:tools/sync/esp_wifi_regulatory.txt"
|
|
||||||
changes:
|
|
||||||
- "components/esp_wifi/regulatory/esp_wifi_regulatory.txt"
|
|
||||||
- project: "ci/actions/common"
|
- project: "ci/actions/common"
|
||||||
file: "templates/idf/build-docs.yml"
|
file: "templates/idf/build-docs.yml"
|
||||||
inputs:
|
inputs:
|
||||||
@@ -51,7 +30,6 @@ include:
|
|||||||
- ".gitlab/ci/upload_cache.yml"
|
- ".gitlab/ci/upload_cache.yml"
|
||||||
- ".gitlab/ci/pre_check.yml"
|
- ".gitlab/ci/pre_check.yml"
|
||||||
- ".gitlab/ci/static-code-analysis.yml"
|
- ".gitlab/ci/static-code-analysis.yml"
|
||||||
- ".gitlab/ci/pre_commit.yml"
|
|
||||||
- ".gitlab/ci/auto_trans.yml"
|
- ".gitlab/ci/auto_trans.yml"
|
||||||
- ".gitlab/ci/build.yml"
|
- ".gitlab/ci/build.yml"
|
||||||
- ".gitlab/ci/host-test.yml"
|
- ".gitlab/ci/host-test.yml"
|
||||||
@@ -59,9 +37,3 @@ include:
|
|||||||
- ".gitlab/ci/pre_deploy.yml"
|
- ".gitlab/ci/pre_deploy.yml"
|
||||||
- ".gitlab/ci/deploy.yml"
|
- ".gitlab/ci/deploy.yml"
|
||||||
- ".gitlab/ci/post_deploy.yml"
|
- ".gitlab/ci/post_deploy.yml"
|
||||||
|
|
||||||
# GIT_LFS_SKIP_SMUDGE has no input slot on the sync-files component; merge it onto the
|
|
||||||
# generated job by name (component job names are "sync-<job_name>").
|
|
||||||
sync-wifi-regulatory:
|
|
||||||
variables:
|
|
||||||
GIT_LFS_SKIP_SMUDGE: 1
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ stages:
|
|||||||
|
|
||||||
include:
|
include:
|
||||||
- project: "ci/actions/common"
|
- project: "ci/actions/common"
|
||||||
ref: "v2"
|
|
||||||
file: "templates/idf/common-scripts.yml"
|
file: "templates/idf/common-scripts.yml"
|
||||||
inputs:
|
inputs:
|
||||||
ci_python_constraint_file: "espidf.constraints.v6.2.txt"
|
ci_python_constraint_file: "espidf.constraints.v6.2.txt"
|
||||||
@@ -69,6 +68,7 @@ variables:
|
|||||||
ESP_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2:1"
|
ESP_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2:1"
|
||||||
ESP_IDF_DOC_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-docs:1"
|
ESP_IDF_DOC_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-docs:1"
|
||||||
TARGET_TEST_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-target-test:1"
|
TARGET_TEST_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v6.2-target-test:1"
|
||||||
|
PRE_COMMIT_ENV_IMAGE: "${CI_REGISTRY}/ci/images/pre-commit-idf-v6.2:1"
|
||||||
|
|
||||||
# Set this variable to the branch of idf-constraints repo in order to test a custom Python constraint file. The
|
# Set this variable to the branch of idf-constraints repo in order to test a custom Python constraint file. The
|
||||||
# branch name must be without the remote part ("origin/"). Keep the variable empty in order to use the constraint
|
# branch name must be without the remote part ("origin/"). Keep the variable empty in order to use the constraint
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
.check_pre_commit_template:
|
|
||||||
extends:
|
|
||||||
- .before_script:minimal
|
|
||||||
stage: pre_check
|
|
||||||
image: "${CI_REGISTRY}/ci/images/pre-commit-idf:1"
|
|
||||||
tags: [pre-commit]
|
|
||||||
variables:
|
|
||||||
# Both shiny and brew runners can pick this job
|
|
||||||
GIT_STRATEGY: fetch
|
|
||||||
GIT_DEPTH: 1
|
|
||||||
SUBMODULES_TO_FETCH: "all"
|
|
||||||
needs:
|
|
||||||
- pipeline_variables
|
|
||||||
script:
|
|
||||||
- fetch_submodules
|
|
||||||
- pre-commit run --files $MODIFIED_FILES
|
|
||||||
- pre-commit run --hook-stage post-commit validate-sbom-manifest
|
|
||||||
|
|
||||||
check_pre_commit:
|
|
||||||
extends:
|
|
||||||
- .check_pre_commit_template
|
|
||||||
rules:
|
|
||||||
- if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/) && $CI_PIPELINE_SOURCE == "push"'
|
|
||||||
when: never
|
|
||||||
- when: on_success
|
|
||||||
cache:
|
|
||||||
- key: submodule-cache-${LATEST_GIT_TAG}
|
|
||||||
paths:
|
|
||||||
- .cache/submodule_archives
|
|
||||||
policy: pull
|
|
||||||
@@ -1,8 +1,3 @@
|
|||||||
include:
|
|
||||||
- project: "ci/actions/common"
|
|
||||||
ref: "v2"
|
|
||||||
file: "templates/idf/app-size-report.yml"
|
|
||||||
|
|
||||||
all_build_finished:
|
all_build_finished:
|
||||||
stage: assign_test
|
stage: assign_test
|
||||||
tags: [fast_run, shiny]
|
tags: [fast_run, shiny]
|
||||||
@@ -65,6 +60,12 @@ app-size-metrics:
|
|||||||
- python3 generate_metrics.py
|
- python3 generate_metrics.py
|
||||||
- esp-metrics-cli upload -d schema.yaml -i metrics.json
|
- esp-metrics-cli upload -d schema.yaml -i metrics.json
|
||||||
|
|
||||||
|
include:
|
||||||
|
- project: "ci/actions/common"
|
||||||
|
file:
|
||||||
|
- "templates/idf/app-size-metrics-report.yml"
|
||||||
|
- "templates/idf/app-size-metrics-full-report.yml"
|
||||||
|
|
||||||
generate_pytest_child_pipeline:
|
generate_pytest_child_pipeline:
|
||||||
# finally, we can get some use out of the default behavior that downloads all artifacts from the previous stage
|
# finally, we can get some use out of the default behavior that downloads all artifacts from the previous stage
|
||||||
stage: assign_test
|
stage: assign_test
|
||||||
|
|||||||
Reference in New Issue
Block a user