tools/ci.sh: Put echo of CI path in a separate function.

Because the setup functions may print other information which should not be
added to the path.

Signed-off-by: Damien George <damien@micropython.org>

3 files changed, 12 insertions, 3 deletions

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index b89e462e0..041074557 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf3_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH
     - name: Build
       env:
         IDF_PATH: ${{ github.workspace }}/esp-idf
@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf4_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
     - name: Build
       env:
         IDF_PATH: ${{ github.workspace }}/esp-idf
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index f6f2fcaf4..f4ce1f821 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -18,6 +18,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp8266_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
     - name: Build
       run: source tools/ci.sh && ci_esp8266_build
diff --git a/tools/ci.sh b/tools/ci.sh
index ded9fab92..32fccf071 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -75,6 +75,9 @@ function ci_esp32_idf3_setup {
     sudo pip3 install pyserial 'pyparsing<2.4'
     curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
     git clone https://github.com/espressif/esp-idf.git
+}
+
+function ci_esp32_idf3_path {
     echo $(pwd)/xtensa-esp32-elf/bin
 }
 
@@ -90,6 +93,9 @@ function ci_esp32_idf4_setup {
     sudo pip3 install pyserial 'pyparsing<2.4'
     curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
     git clone https://github.com/espressif/esp-idf.git
+}
+
+function ci_esp32_idf4_path {
     echo $(pwd)/xtensa-esp32-elf/bin
 }
 
@@ -108,6 +114,9 @@ function ci_esp8266_setup {
     sudo pip install pyserial
     wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
     zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+}
+
+function ci_esp8266_path {
     echo $(pwd)/xtensa-lx106-elf/bin
 }