Skip to content

Commit 5fbfd29

Browse files
committed
ci: fix esp8266 glab ci failed
1 parent 7c0f820 commit 5fbfd29

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

.glab-ci.yml

+3-13
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ stages:
77
variables: &global-variables
88
IDF_PATH: "$CI_PROJECT_DIR/esp-idf"
99
GIT_STRATEGY: clone
10-
GIT_SUBMODULE_STRATEGY: recursive
11-
ESPCI_TOKEN: $GITLAB_KEY
1210

1311
.esp_at_build_template:
1412
stage: build
15-
image: $CI_DOCKER_REGISTRY/esp-env-v5.0:2
13+
image: $CI_DOCKER_REGISTRY/esp8266-ci-env-new
1614
tags:
1715
- build
1816
variables:
@@ -37,7 +35,6 @@ variables: &global-variables
3735
- build/flasher_args.json
3836
- build/download.config
3937
- build/factory/*
40-
- build/custom_ota_binaries/*
4138
expire_in: 6 mos
4239
only:
4340
variables:
@@ -48,18 +45,11 @@ customer_at_build:
4845
extends: .esp_at_build_template
4946
script:
5047
- 'echo -e ${MODULE_CFG_INFO} > module_info.json'
51-
- sed -i "s?https://github.com?$GITLAB_SSH_SERVER?g" module_config/${MODULE_CFG_DIR}/IDF_VERSION
5248
- mkdir build
5349
- cp module_info.json build/module_info.json
54-
- export HAS_IDF_PREREQUISITES=1
55-
- ./build.py install
50+
- ./build.py install || true
5651
- rm -rf build && mkdir build
5752
- mv module_info.json build/module_info.json
58-
59-
- source esp-idf/tools/ci/utils.sh
6053
- source esp-idf/tools/ci/configure_ci_environment.sh
61-
- esp-idf/tools/idf_tools.py install
62-
- esp-idf/tools/idf_tools.py export
63-
64-
- export ESP_AT_PROJECT_BRANCH=${CI_COMMIT_REF_NAME}
54+
- ./esp-idf/tools/idf_tools.py --non-interactive install && eval "$(./esp-idf/tools/idf_tools.py --non-interactive export)" || exit 1
6555
- ./build.py build

0 commit comments

Comments
 (0)