Merge branch 'feature/ci_minor_fixes' into 'master'

ci minor fixes See merge request !707
2017-04-28 00:25:13 +08:00 · 2017-04-28 00:25:13 +08:00 · 6f0a9f76cd
parent b8c1720736 69bf14360d
commit 6f0a9f76cd
9 changed files with 23 additions and 67 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -29,7 +29,6 @@ build_template_app:
    - build

  variables:
-    SDK_PATH: "$CI_PROJECT_DIR"
    IDF_PATH: "$CI_PROJECT_DIR"
    GIT_STRATEGY: clone
    BATCH_BUILD: "1"
@ -54,14 +53,13 @@ build_template_app:
    - test $(xtensa-esp32-elf-nm *.a | grep -w ets_printf | wc -l) -eq 0


-.build_gitlab: &build_template
+.build_template: &build_template
  stage: build
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env
  tags:
    - build
-  image: $CI_DOCKER_REGISTRY/esp32-ci-env

  variables:
-    SDK_PATH: "$CI_PROJECT_DIR"
    IDF_PATH: "$CI_PROJECT_DIR"
    GIT_STRATEGY: clone
    BATCH_BUILD: "1"
@ -176,18 +174,18 @@ test_build_system:
 test_report:
  stage: test_report
  image: $CI_DOCKER_REGISTRY/esp32-ci-env
+  tags:
+    - report
  only:
    - master
    - triggers
    - /^release\/v/
    - /^v\d+\.\d+(\.\d+)?($|-)/
-  tags:
-    - report
  variables:
    LOG_PATH: "$CI_PROJECT_DIR/$CI_BUILD_REF"
    TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test"
    REPORT_PATH: "$CI_PROJECT_DIR/CI_Test_Report"
-    MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/tools/unit-test-app/ModuleDefinition.yml"
+    MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/tools/unit-test-app/tools/ModuleDefinition.yml"
  artifacts:
    when: always
    paths:
@ -228,14 +226,14 @@ push_master_to_github:
  before_script:
    - echo "Not setting up GitLab key, not fetching submodules"
  stage: deploy
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env
+  tags:
+    - deploy
  only:
    - master
    - /^release\/v/
    - /^v\d+\.\d+(\.\d+)?($|-)/
-  tags:
-    - deploy
  when: on_success
-  image: $CI_DOCKER_REGISTRY/esp32-ci-env
  variables:
    GIT_STRATEGY: clone
    GITHUB_PUSH_REFS: refs/remotes/origin/release refs/remotes/origin/master
@ -261,14 +259,14 @@ deploy_docs:
  before_script:
    - echo "Not setting up GitLab key, not fetching submodules"
  stage: deploy
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env
+  tags:
+    - deploy
  only:
   - master
   - /^release\/v/
   - /^v\d+\.\d+(\.\d+)?($|-)/
   - triggers
-  tags:
-    - deploy
-  image: $CI_DOCKER_REGISTRY/esp32-ci-env
  script:
    - mkdir -p ~/.ssh
    - chmod 700 ~/.ssh
@ -319,7 +317,6 @@ check_commit_msg:
    # commit start with "WIP: " need to be squashed before merge
    - 'git log --pretty=%s master..${CI_BUILD_REF_NAME} | grep "^WIP: " || exit 0 && exit 1'

-# AUTO GENERATED PART START, DO NOT MODIFY CONTENT BELOW
 # template for test jobs
 .test_template: &test_template
  stage: test
@ -339,7 +336,7 @@ check_commit_msg:
    # append test level folder to TEST_CASE_FILE_PATH in before_script of test job
    TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test/integration_test"
    # jobs MUST set CONFIG_FILE in before_script, and overwrite the variables above if necessary
-    MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/unit_test/ModuleDefinition.yml"
+    MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/tools/unit-test-app/tools/ModuleDefinition.yml"

  artifacts:
    when: always
--- a/components/esp32/test/component.mk
+++ b/components/esp32/test/component.mk
@ -8,8 +8,6 @@ COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-a

 COMPONENT_SRCDIRS := . test_vectors

-include $(IDF_PATH)/make/component_common.mk
-
 test_tjpgd.o: test_tjpgd_logo.h

 test_tjpgd_logo.h: $(COMPONENT_PATH)/logo.jpg
--- a/components/nghttp/Makefile
+++ b/components/nghttp/Makefile
@ -1,17 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default, 
-# this will take the sources in this directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-COMPONENT_ADD_INCLUDEDIRS := port/include include
-
-COMPONENT_SRCDIRS := library port
-
-#EXTRA_CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"'
-
-EXTRA_CFLAGS := -Wno-error=address -Waddress -DHAVE_CONFIG_H
-
-include $(IDF_PATH)/make/component.mk
--- a/examples/bluetooth/blufi/main/component.mk
+++ b/examples/bluetooth/blufi/main/component.mk
@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
--- a/examples/bluetooth/gatt_client/main/component.mk
+++ b/examples/bluetooth/gatt_client/main/component.mk
@ -1,10 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
+# "main" pseudo-component makefile.
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-
-#include $(IDF_PATH)/make/component_common.mk
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
--- a/examples/bluetooth/gatt_server/main/component.mk
+++ b/examples/bluetooth/gatt_server/main/component.mk
@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
--- a/examples/bluetooth/gatt_server_service_table/main/component.mk
+++ b/examples/bluetooth/gatt_server_service_table/main/component.mk
@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
--- a/examples/peripherals/i2s/main/component.mk
+++ b/examples/peripherals/i2s/main/component.mk
@ -1,10 +1,6 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component.mk. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)

 COMPONENT_ADD_INCLUDEDIRS := .
--- a/make/common.mk
+++ b/make/common.mk
@ -7,7 +7,7 @@
 # (Note that we only rebuild this makefile automatically for some
 # targets, see project_config.mk for details.)
 SDKCONFIG_MAKEFILE ?= $(abspath $(BUILD_DIR_BASE)/include/config/auto.conf)
-include $(SDKCONFIG_MAKEFILE)
+-include $(SDKCONFIG_MAKEFILE)
 export SDKCONFIG_MAKEFILE  # sub-makes (like bootloader) will reuse this path

 # BATCH_BUILD flag disables interactive terminal features, defaults to verbose build