@@ -7,12 +7,10 @@ stages:
7
7
variables : &global-variables
8
8
IDF_PATH : " $CI_PROJECT_DIR/esp-idf"
9
9
GIT_STRATEGY : clone
10
- GIT_SUBMODULE_STRATEGY : recursive
11
- ESPCI_TOKEN : $GITLAB_KEY
12
10
13
11
.esp_at_build_template :
14
12
stage : build
15
- image : $CI_DOCKER_REGISTRY/esp- env-v5.0:2
13
+ image : $CI_DOCKER_REGISTRY/esp8266-ci- env-new
16
14
tags :
17
15
- build
18
16
variables :
@@ -37,7 +35,6 @@ variables: &global-variables
37
35
- build/flasher_args.json
38
36
- build/download.config
39
37
- build/factory/*
40
- - build/custom_ota_binaries/*
41
38
expire_in : 6 mos
42
39
only :
43
40
variables :
@@ -48,18 +45,11 @@ customer_at_build:
48
45
extends : .esp_at_build_template
49
46
script :
50
47
- ' 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
52
48
- mkdir build
53
49
- cp module_info.json build/module_info.json
54
- - export HAS_IDF_PREREQUISITES=1
55
- - ./build.py install
50
+ - ./build.py install || true
56
51
- rm -rf build && mkdir build
57
52
- mv module_info.json build/module_info.json
58
-
59
- - source esp-idf/tools/ci/utils.sh
60
53
- 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
65
55
- ./build.py build
0 commit comments