From 5b1f57f690ef6acf3b32b53fa0ddc13fd66c68e0 Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Thu, 25 Sep 2025 15:50:47 +0200 Subject: [PATCH] ci: Removes deployment of docs and component Release of documents and component should be done manually until we introduce the automation properly. ci: Solve the warnings on docs_build ci: Adopts the old strategy to push to github --- .gitlab-ci.yml | 29 +++++++++++++++++++++-------- .gitlab/ci/build.yml | 2 ++ .gitlab/ci/deploy.yml | 20 +++++--------------- .gitlab/ci/docs.yml | 19 ------------------- 4 files changed, 28 insertions(+), 42 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ccfe31..6521076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,24 @@ stages: - - build - - test - - test_deploy - - deploy + - pre_check + - build + - test + - test_deploy + - deploy + +variables: + TEST_BROKER_BRNO_TCP: "${TEST_BROKER_BRNO_TCP}" + TEST_BROKER_BRNO_SSL: "${TEST_BROKER_BRNO_SSL}" + TEST_BROKER_BRNO_WS: "${TEST_BROKER_BRNO_WS}" + TEST_BROKER_BRNO_WSS: "${TEST_BROKER_BRNO_WSS}" + EXAMPLE_MQTT_BROKER_CERTIFICATE: "${EXAMPLE_MQTT_BROKER_CERTIFICATE}" include: - - local: ".gitlab/ci/build.yml" - - local: ".gitlab/ci/test.yml" - - local: ".gitlab/ci/docs.yml" - - local: ".gitlab/ci/deploy.yml" + - local: ".gitlab/ci/build.yml" + - local: ".gitlab/ci/docs.yml" + - local: ".gitlab/ci/test.yml" + - local: ".gitlab/ci/deploy.yml" + +workflow: + rules: + - if: $CI_COMMIT_REF_NAME == "master" + - if: $CI_PIPELINE_SOURCE == "merge_request_event" diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 84e536a..8b5eec3 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -9,6 +9,8 @@ script: - pip install -U 'idf-ci<1' - idf-ci build run + --parallel-count ${CI_NODE_TOTAL:-1} + --parallel-index ${CI_NODE_INDEX:-1} build_idf_v5.3: extends: .build_template diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 38920d1..f65c3a2 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -11,19 +11,9 @@ push_master_to_github: variables: GIT_STRATEGY: clone script: - - source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh - - add_github_remote "$GH_PUSH_KEY" "$GH_PUSH_REPO" + - curl -sSL ${CIT_LOADER_URL} | sh + - source citools/import_functions + - cit_add_ssh_key "${GH_PUSH_KEY}" + - git remote remove github || true + - git remote add github ${GH_PUSH_REPO} - git push github HEAD:${CI_COMMIT_REF_NAME} - -upload_to_component_manager: - stage: deploy - image: python:3.10-alpine - tags: - - deploy - rules: - - if: '$CI_COMMIT_BRANCH == "master"' - script: - - pip install idf-component-manager - - export IDF_COMPONENT_API_TOKEN=${MQTT_COMPONENT_API_KEY} - - export COMP_VERSION=$(grep 'version:' idf_component.yml | head -n 1 | awk '{print $2}' | tr -d '"') - - compote component upload --namespace=espressif --name=mqtt --allow-existing --version=${COMP_VERSION} diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml index 5402d09..0ee004e 100644 --- a/.gitlab/ci/docs.yml +++ b/.gitlab/ci/docs.yml @@ -9,8 +9,6 @@ docs_build: tags: - build_docs variables: - # Set Python buffering for better CI output - PYTHONUNBUFFERED: 1 TYPE: "preview" DOCS_BUILD_DIR: "${CI_PROJECT_DIR}/docs/_build/" artifacts: @@ -63,20 +61,3 @@ deploy_docs_preview: DOCS_DEPLOY_SERVER_USER: "$DOCS_PREVIEW_SERVER_USER" DOCS_DEPLOY_PATH: "$DOCS_PREVIEW_PATH" DOCS_DEPLOY_URL_BASE: "$DOCS_PREVIEW_URL_BASE" - -deploy_docs_prod: - extends: - - .deploy_docs_template - stage: deploy - only: - refs: - - master - needs: - - docs_build - variables: - TYPE: "production" - DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_PRIVATEKEY" - DOCS_DEPLOY_SERVER: "$DOCS_PROD_SERVER" - DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER" - DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH" - DOCS_DEPLOY_URL_BASE: "$DOCS_PROD_URL_BASE"