TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

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

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

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2020-12-14 13:05:43 +11:00
parent e0bb7a53c3
commit 69262a11dc
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ports_esp32.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install packages - 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 - name: Build
env: env:
IDF_PATH: ${{ github.workspace }}/esp-idf IDF_PATH: ${{ github.workspace }}/esp-idf
@@ -29,7 +29,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install packages - 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 - name: Build
env: env:
IDF_PATH: ${{ github.workspace }}/esp-idf IDF_PATH: ${{ github.workspace }}/esp-idf

2
.github/workflows/ports_esp8266.yml vendored
View File

@@ -18,6 +18,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install packages - 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 - name: Build
run: source tools/ci.sh && ci_esp8266_build run: source tools/ci.sh && ci_esp8266_build

9
tools/ci.sh
View File

@@ -75,6 +75,9 @@ function ci_esp32_idf3_setup {
sudo pip3 install pyserial 'pyparsing<2.4' 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 - 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 git clone https://github.com/espressif/esp-idf.git
}
function ci_esp32_idf3_path {
echo $(pwd)/xtensa-esp32-elf/bin echo $(pwd)/xtensa-esp32-elf/bin
} }
@@ -90,6 +93,9 @@ function ci_esp32_idf4_setup {
sudo pip3 install pyserial 'pyparsing<2.4' 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 - 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 git clone https://github.com/espressif/esp-idf.git
}
function ci_esp32_idf4_path {
echo $(pwd)/xtensa-esp32-elf/bin echo $(pwd)/xtensa-esp32-elf/bin
} }
@@ -108,6 +114,9 @@ function ci_esp8266_setup {
sudo pip install pyserial sudo pip install pyserial
wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz 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 zcat xtensa-lx106-elf-standalone.tar.gz | tar x
}
function ci_esp8266_path {
echo $(pwd)/xtensa-lx106-elf/bin echo $(pwd)/xtensa-lx106-elf/bin
} }