Skip to content

Commit 28c2fcd

Browse files
laukik-hasemahavirj
andcommitted
ci: Updated pipeline build stage
- Updated docker image - Fixed typo in build script name - Added wolfssl submodule sync provision - CI build against IDF master branch and use CMake Co-authored-by: Mahavir Jain <[email protected]>
1 parent decbdf8 commit 28c2fcd

File tree

2 files changed

+17
-46
lines changed

2 files changed

+17
-46
lines changed

.gitlab-ci.yml

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variables:
66
BATCH_BUILD: "1"
77
V: "0"
88
MAKEFLAGS: "-j5 --no-keep-going"
9+
GIT_SUBMODULE_STRATEGY: recursive
910

1011
# before each job, we need to check if this job is filtered by bot stage/job filter
1112
.apply_bot_filter: &apply_bot_filter
@@ -25,65 +26,36 @@ variables:
2526
- git --version
2627
- git submodule update --init --recursive
2728

28-
test_build_esp32:
29-
when: always
29+
.build_idf_template:
3030
stage: build
31-
image: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v2"
31+
image: espressif/idf:latest
3232
tags:
3333
- build
3434
variables:
35-
IDF_PATH: "$CI_PROJECT_DIR/idf/esp-idf"
36-
before_script: *setup_env
35+
PEDANTIC_FLAGS: "-Werror -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
36+
EXTRA_CFLAGS: "${PEDANTIC_FLAGS}"
37+
EXTRA_CXXFLAGS: "${PEDANTIC_FLAGS}"
3738
script:
38-
- export PATH="$IDF_PATH/tools:$PATH"
39-
- mkdir idf
40-
- cd idf
41-
- export
42-
- git clone --recursive --depth 1 $GITLAB_SSH_SERVER/idf/esp-idf.git
43-
- pushd esp-idf
44-
- echo "v4.1" > version.txt
45-
- source tools/ci/setup_python.sh
46-
- source tools/ci/configure_ci_environment.sh
47-
- tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
48-
- popd
49-
- cd ../tools/ci && ./build_exmaples.sh || exit 1
39+
- cd $CI_PROJECT_DIR/tools/ci
40+
- ./build_examples.sh || exit 1
5041

51-
test_build_esp8266:
52-
when: always
53-
stage: build
54-
image: $CI_DOCKER_REGISTRY/esp8266-ci-env-new
55-
tags:
56-
- build
57-
variables:
58-
IDF_PATH: "$CI_PROJECT_DIR/idf/ESP8266_RTOS_SDK"
59-
before_script: *setup_env
60-
script:
61-
- export PATH="$IDF_PATH/tools:$PATH"
62-
- mkdir idf
63-
- cd idf
64-
- export
65-
- git clone --recursive --depth 1 $GITLAB_SSH_SERVER/sdk/ESP8266_RTOS_SDK.git
66-
- pushd ESP8266_RTOS_SDK
67-
- echo "v3.3" > version.txt
68-
- tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
69-
- source tools/ci/configure_ci_environment.sh
70-
- popd
71-
- cd ../tools/ci && ./build_exmaples.sh || exit 1
42+
build_idf_master:
43+
extends: .build_idf_template
44+
image: espressif/idf:latest
7245

46+
build_idf_v4.4:
47+
extends: .build_idf_template
48+
image: espressif/idf:release-v4.4
7349

7450
push_master_to_github:
7551
stage: deploy
76-
image: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v2"
52+
image: espressif/idf:latest
7753
tags:
7854
- deploy
7955
only:
8056
- master
81-
- /^release\/v/
82-
- /^v\d+\.\d+(\.\d+)?($|-)/
8357
when: on_success
84-
dependencies:
85-
- test_build_esp32
86-
- test_build_esp8266
58+
dependencies: []
8759
variables:
8860
GITHUB_PUSH_REFS: refs/remotes/origin/release refs/remotes/origin/master
8961
before_script: *setup_env

tools/ci/build_exmaples.sh renamed to tools/ci/build_examples.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ build_example () {
77
cd $example_dir
88

99
rm sdkconfig
10-
make defconfig
11-
make -j4
10+
idf.py build
1211
}
1312

1413
EXAMPLE_PATHS=$( find ${CI_PROJECT_DIR}/examples/ -type f -name Makefile | grep -v "/components/" | grep -v "/common_components/" | grep -v "/main/" | grep -v "/build_system/cmake/" | sort )

0 commit comments

Comments
 (0)