mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-05 05:34:32 +02:00
Merge branch 'bugfix/ci_git_tag' into 'master'
CI: Fix git tag in cmake build tests where email address cannot be autodetected See merge request espressif/esp-idf!12719
This commit is contained in:
@@ -148,9 +148,7 @@ function run_tests()
|
|||||||
|
|
||||||
print_status "Project is in ESP-IDF which has a custom tag"
|
print_status "Project is in ESP-IDF which has a custom tag"
|
||||||
pushd ${IDF_PATH}/examples/get-started/hello_world
|
pushd ${IDF_PATH}/examples/get-started/hello_world
|
||||||
git config -f test.conf user.email "noone@espressif.com"
|
GIT_COMMITTER_NAME="No One" GIT_COMMITTER_EMAIL="noone@espressif.com" git tag mytag -a -m "mytag" || failure "Git cannot create tag"
|
||||||
git config -f test.conf user.name "No One"
|
|
||||||
GIT_CONFIG=test.conf git tag mytag -a -m "mytag"
|
|
||||||
idf.py reconfigure &> log.log || failure "Failed to build"
|
idf.py reconfigure &> log.log || failure "Failed to build"
|
||||||
str="App \"hello-world\" version: mytag"
|
str="App \"hello-world\" version: mytag"
|
||||||
grep "${str}" log.log || { cat log.log ; failure "Project version should be the custom tag"; }
|
grep "${str}" log.log || { cat log.log ; failure "Project version should be the custom tag"; }
|
||||||
@@ -159,7 +157,7 @@ function run_tests()
|
|||||||
failure "IDF version $idf_version should not contain mytag"
|
failure "IDF version $idf_version should not contain mytag"
|
||||||
fi
|
fi
|
||||||
git tag -d mytag
|
git tag -d mytag
|
||||||
rm -rf sdkconfig build test.conf
|
rm -rf sdkconfig build
|
||||||
popd
|
popd
|
||||||
|
|
||||||
print_status "Moving BUILD_DIR_BASE out of tree"
|
print_status "Moving BUILD_DIR_BASE out of tree"
|
||||||
|
Reference in New Issue
Block a user