Просмотр исходного кода

Merge branch 'bugfix/fix_ci_timeouts' into 'master'

Fix CI: Use idf from github

See merge request espressif/esp-serial-flasher!17
Martin Válik 5 лет назад
Родитель
Сommit
1d14d1c73d
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      .gitlab-ci.yml

+ 3 - 3
.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - test
   - test
 
 
 variables:
 variables:
-  IDF_REPO: ${GITLAB_SSH_SERVER}/espressif/esp-idf.git
+  IDF_REPO: ${IDF_GIT_SERVER}/espressif/esp-idf.git
   STM32_CUBE_F4_REPO: https://github.com/STMicroelectronics/STM32CubeF4
   STM32_CUBE_F4_REPO: https://github.com/STMicroelectronics/STM32CubeF4
   SERIAL_FLASHER_REPO: ${GITLAB_SSH_SERVER}/espressif/esp-serial-flasher.git
   SERIAL_FLASHER_REPO: ${GITLAB_SSH_SERVER}/espressif/esp-serial-flasher.git
   QEMU_PATH: /opt/qemu/bin/qemu-system-xtensa
   QEMU_PATH: /opt/qemu/bin/qemu-system-xtensa
@@ -66,11 +66,11 @@ run_tests:
       -drive file=empty_file.bin,if=mtd,format=raw
       -drive file=empty_file.bin,if=mtd,format=raw
       -global driver=esp32.gpio,property=strap_mode,value=0x0f
       -global driver=esp32.gpio,property=strap_mode,value=0x0f
       -serial tcp::5555,server,nowait
       -serial tcp::5555,server,nowait
-    
+
     - cd $CI_PROJECT_DIR/test && mkdir build && cd build
     - cd $CI_PROJECT_DIR/test && mkdir build && cd build
 
 
     # Compile and run qemu tests
     # Compile and run qemu tests
     - cmake .. -DQEMU_TEST=True && make && ./serial_flasher_test
     - cmake .. -DQEMU_TEST=True && make && ./serial_flasher_test
 
 
     # Compile and run host tests
     # Compile and run host tests
-    - cmake .. -DQEMU_TEST=False && make && ./serial_flasher_test
+    - cmake .. -DQEMU_TEST=False && make && ./serial_flasher_test