From 544f8780339dddbcdb0105150d805ce7bf49f341 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 15:38:33 +0700 Subject: [PATCH 1/7] test building esp32s2 with docker --- .github/workflows/build.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0174b9cb7..87540f468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,21 @@ name: Build on: [pull_request, push, repository_dispatch] jobs: + # Build ESP32S + build-esp32s-docker: + runs-on: ubuntu-latest + steps: + - name: Setup Python + uses: actions/setup-python@v1 + + - name: failed + run: | + exit 1 + # Unit testing with Ceedling unit-test: - runs-on: ubuntu-latest + runs-on: ubuntu-latest + needs: build-esp32s-docker steps: - name: Setup Ruby uses: actions/setup-ruby@v1 @@ -23,6 +35,7 @@ jobs: # Build most of the ports build: runs-on: ubuntu-latest + needs: build-esp32s-docker strategy: fail-fast: false matrix: @@ -79,6 +92,7 @@ jobs: # Build ESP32S build-esp32s: runs-on: ubuntu-latest + needs: build-esp32s-docker steps: - name: Setup Python uses: actions/setup-python@v1 From 7691db0e9ea5680d9224805b8515870e2d2170bc Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 15:39:11 +0700 Subject: [PATCH 2/7] test docker version --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87540f468..84a7abe99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,7 @@ jobs: - name: failed run: | + docker --version exit 1 # Unit testing with Ceedling From 836c70e80d044b9a49d12183fbc7c294ec0202b0 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 16:05:23 +0700 Subject: [PATCH 3/7] pul idf latest --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84a7abe99..2ef6aaad7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ jobs: - name: failed run: | docker --version + docker pull espressif/idf:latest exit 1 # Unit testing with Ceedling From 474404f6f128be7b8fd0e2eb2c0fa5376ffa717f Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 16:26:54 +0700 Subject: [PATCH 4/7] try build with docker --- .github/workflows/build.yml | 15 ++++++++++++--- .gitignore | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ef6aaad7..8c06797a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,19 @@ jobs: - name: Setup Python uses: actions/setup-python@v1 - - name: failed + #- name: Docker ESP-IDF + # run: docker pull espressif/idf:latest + + - name: Checkout TinyUSB + uses: actions/checkout@v2 + with: + submodules: 'false' + + - name: Build run: | - docker --version - docker pull espressif/idf:latest + cd examples/device/cdc_msc_freertos + docker run --rm -v $PWD:/project -w /project espressif/idf:latest idf.py build + #python3 tools/build_esp32s.py exit 1 # Unit testing with Ceedling diff --git a/.gitignore b/.gitignore index ea08146b4..cc700948b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ latex *.elf *.ind .env +.settings/ +.idea/ /examples/*/*/build* test_old/ tests_obsolete/ From 7a025c9282c09c547f956ce7cd973d92db97a4e6 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 16:58:51 +0700 Subject: [PATCH 5/7] try build script with docker --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c06797a0..f2548eab4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,8 @@ jobs: - name: Setup Python uses: actions/setup-python@v1 - #- name: Docker ESP-IDF - # run: docker pull espressif/idf:latest + - name: Pull ESP-IDF docker + run: docker pull espressif/idf:latest - name: Checkout TinyUSB uses: actions/checkout@v2 @@ -21,8 +21,7 @@ jobs: - name: Build run: | cd examples/device/cdc_msc_freertos - docker run --rm -v $PWD:/project -w /project espressif/idf:latest idf.py build - #python3 tools/build_esp32s.py + docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32s.py exit 1 # Unit testing with Ceedling From 86a46f0467696f532c956c7525d17a06740bd7c5 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 17:00:44 +0700 Subject: [PATCH 6/7] try again --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2548eab4..2fec38faf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,6 @@ jobs: - name: Build run: | - cd examples/device/cdc_msc_freertos docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32s.py exit 1 From 66bd68f1e9d9607e8af3392f9f2a199eaad08895 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 18 Apr 2020 17:11:36 +0700 Subject: [PATCH 7/7] everything seems fine, final test. --- .github/workflows/build.yml | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fec38faf..9eebfaaf4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,30 +3,9 @@ name: Build on: [pull_request, push, repository_dispatch] jobs: - # Build ESP32S - build-esp32s-docker: - runs-on: ubuntu-latest - steps: - - name: Setup Python - uses: actions/setup-python@v1 - - - name: Pull ESP-IDF docker - run: docker pull espressif/idf:latest - - - name: Checkout TinyUSB - uses: actions/checkout@v2 - with: - submodules: 'false' - - - name: Build - run: | - docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32s.py - exit 1 - # Unit testing with Ceedling unit-test: runs-on: ubuntu-latest - needs: build-esp32s-docker steps: - name: Setup Ruby uses: actions/setup-ruby@v1 @@ -44,7 +23,6 @@ jobs: # Build most of the ports build: runs-on: ubuntu-latest - needs: build-esp32s-docker strategy: fail-fast: false matrix: @@ -101,16 +79,12 @@ jobs: # Build ESP32S build-esp32s: runs-on: ubuntu-latest - needs: build-esp32s-docker steps: - name: Setup Python uses: actions/setup-python@v1 - - name: Install Toolchains - run: | - git clone --depth 1 https://github.com/espressif/esp-idf.git $HOME/esp-idf - cd $HOME/esp-idf - ./install.sh + - name: Pull ESP-IDF docker + run: docker pull espressif/idf:latest - name: Checkout TinyUSB uses: actions/checkout@v2 @@ -118,6 +92,4 @@ jobs: submodules: 'false' - name: Build - run: | - . $HOME/esp-idf/export.sh - python3 tools/build_esp32s.py + run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32s.py