diff --git a/.ci/Jenkinsfile-compile_mac b/.ci/Jenkinsfile-compile_mac index 7f7837f789..019e9a0ae5 100644 --- a/.ci/Jenkinsfile-compile_mac +++ b/.ci/Jenkinsfile-compile_mac @@ -18,6 +18,7 @@ pipeline { steps { sh 'export' sh 'make distclean' + sh 'git fetch --tags' sh 'ccache -z' sh 'make px4_sitl_default' sh 'ccache -s' @@ -39,6 +40,7 @@ pipeline { steps { sh 'export' sh 'make distclean' + sh 'git fetch --tags' sh 'ccache -z' sh 'make px4_fmu-v5_default' sh 'ccache -s' @@ -60,6 +62,7 @@ pipeline { steps { sh 'export' sh 'make distclean' + sh 'git fetch --tags' sh 'ccache -z' sh 'make tests' sh 'ccache -s' diff --git a/Jenkinsfile b/Jenkinsfile index 5afd687851..59fdca7325 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,7 @@ pipeline { cd catkin_ws; git -C ${WORKSPACE}/catkin_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo git clone --recursive ${WORKSPACE}/catkin_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo; + git -C ${WORKSPACE}/catkin_ws/src/Firmware fetch --tags; source /opt/ros/melodic/setup.bash; catkin init; catkin build -j$(nproc) -l$(nproc); @@ -60,6 +61,7 @@ pipeline { cd colcon_ws; git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo git clone --recursive ${WORKSPACE}/colcon_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo; + git -C ${WORKSPACE}/colcon_ws/src/Firmware fetch --tags; source /opt/ros/bouncy/setup.sh; source /opt/ros/melodic/setup.sh; colcon build --event-handlers console_direct+ --symlink-install; @@ -338,6 +340,7 @@ pipeline { steps { sh 'export' sh 'make distclean' + sh 'git fetch --tags' sh 'make px4_fmu-v2_default stack_check' } post { diff --git a/appveyor.yml b/appveyor.yml index c73289e61c..93f392e9a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,7 +36,7 @@ build_script: # safe the repopath for switching to it in cygwin bash - for /f %%i in ('cygpath -u %%CD%%') do set repopath=%%i # build the make target -- call bash --login -c "cd $repopath && make $PX4_CONFIG" +- call bash --login -c "cd $repopath && git fetch --tags && make $PX4_CONFIG" # Note: using bash --login is important # because otherwise certain things (like python; import numpy) do not work