8000 tools/ci.sh: Put echo of CI path in a separate function. · mbtronics/micropython@69262a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 69262a1

Browse files
dpgeorgedpgeorge
committed
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>
1 parent e0bb7a5 commit 69262a1

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

‎.github/workflows/ports_esp32.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Install packages
21-
run: source tools/ci.sh && ci_esp32_idf3_setup >> $GITHUB_PATH
21+
run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH
2222
- name: Build
2323
env:
2424
IDF_PATH: ${{ github.workspace }}/esp-idf
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v2
3131
- name: Install packages
32-
run: source tools/ci.sh && ci_esp32_idf4_setup >> $GITHUB_PATH
32+
run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
3333
- name: Build
3434
env:
3535
IDF_PATH: ${{ github.workspace }}/esp-idf

‎.github/workflows/ports_esp8266.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Install packages
21-
run: source tools/ci.sh && ci_esp8266_setup >> $GITHUB_PATH
21+
run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
2222
- name: Build
2323
run: source tools/ci.sh && ci_esp8266_build

‎tools/ci.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ function ci_esp32_idf3_setup {
7575
sudo pip3 install pyserial 'pyparsing<2.4'
7676
curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
7777
git clone https://github.com/espressif/esp-idf.git
78+
}
79+
80+
function ci_esp32_idf3_path {
7881
echo $(pwd)/xtensa-esp32-elf/bin
7982
}
8083

@@ -90,6 +93,9 @@ function ci_esp32_idf4_setup {
9093
sudo pip3 install pyserial 'pyparsing<2.4'
9194
curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
9295
git clone https://github.com/espressif/esp-idf.git
96+
}
97+
98+
function ci_esp32_idf4_path {
9399
echo $(pwd)/xtensa-esp32-elf/bin
94100
}
95101

@@ -108,6 +114,9 @@ function ci_esp8266_setup {
108114
sudo pip install pyserial
109115
wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
110116
zcat xtensa-lx106-elf-standalone.tar.gz | tar x
117+
}
118+
119+
function ci_esp8266_path {
111120
echo $(pwd)/xtensa-lx106-elf/bin
112121
}
113122

0 commit comments

Comments
 (0)
0