From 79c8c476fef4ed06f6e70f38e75b6481e63f21b7 Mon Sep 17 00:00:00 2001 From: Brennan Ashton Date: Sat, 14 Mar 2020 23:26:48 -0700 Subject: [PATCH 1/2] Use new images --- .github/actions/ci-container/action.yaml | 7 ++++++ .github/workflows/main.yml | 27 ++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 .github/actions/ci-container/action.yaml diff --git a/.github/actions/ci-container/action.yaml b/.github/actions/ci-container/action.yaml new file mode 100644 index 0000000000000..5bdbc4384c5c8 --- /dev/null +++ b/.github/actions/ci-container/action.yaml @@ -0,0 +1,7 @@ +name: ci-container +runs: + using: 'docker' + image: 'docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux' + args: + - "-c" + - ${{ inputs.run }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44165c63591f4..3935bab4c1086 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,6 @@ on: jobs: check: runs-on: ubuntu-18.04 - container: liuguo09/ubuntu-nuttx:18.04 steps: - name: Checkout nuttx repo @@ -60,12 +59,12 @@ jobs: build: runs-on: ubuntu-18.04 - container: liuguo09/ubuntu-nuttx:18.04 + env: + DOCKER_BUILDKIT: 1 strategy: matrix: - boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim] - + boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim, xtensa] steps: - name: Checkout nuttx repo uses: actions/checkout@v2 @@ -91,7 +90,21 @@ jobs: repository: apache/incubator-nuttx-testing path: testing + - name: Docker Login + uses: azure/docker-login@v1 + with: + login-server: docker.pkg.github.com + username: ${GITHUB_ACTOR} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Run Pull Container + uses: ./nuttx/.github/actions/ci-container + - name: Run builds - run: | - cd testing - ./cibuild.sh -x testlist/${{matrix.boards}}.dat + uses: ./nuttx/.github/actions/ci-container + env: + BLOBDIR: /tools/blobs + with: + run: | + cd testing + ./cibuild.sh -x testlist/${{matrix.boards}}.dat From 3b003d4c64f36ec45933e2ceca51958924c00a21 Mon Sep 17 00:00:00 2001 From: Brennan Ashton Date: Sun, 22 Mar 2020 14:47:51 -0700 Subject: [PATCH 2/2] Pull the ESP32 binary blobs from a configurable path --- .github/actions/ci-container/action.yaml | 13 +++++++++++++ .github/workflows/main.yml | 2 +- boards/xtensa/esp32/esp32-core/scripts/Config.mk | 15 ++++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/actions/ci-container/action.yaml b/.github/actions/ci-container/action.yaml index 5bdbc4384c5c8..f2cc6146d79c5 100644 --- a/.github/actions/ci-container/action.yaml +++ b/.github/actions/ci-container/action.yaml @@ -1,3 +1,16 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + name: ci-container runs: using: 'docker' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3935bab4c1086..9e07b2d212fc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: strategy: matrix: - boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim, xtensa] + boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86-xtensa, sim] steps: - name: Checkout nuttx repo uses: actions/checkout@v2 diff --git a/boards/xtensa/esp32/esp32-core/scripts/Config.mk b/boards/xtensa/esp32/esp32-core/scripts/Config.mk index 4e60251124b83..edfb0c12ef435 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/Config.mk +++ b/boards/xtensa/esp32/esp32-core/scripts/Config.mk @@ -23,6 +23,13 @@ # archive. These replace the default definitions at tools/Config.mk # POSTBUILD -- Perform post build operations +ifdef BLOBDIR + BOOTLOADER=${BLOBDIR}/esp32core/bootloader.bin + PARTITION_TABLE=${BLOBDIR}/esp32core/partition-table.bin +else + BOOTLOADER=$(IDF_PATH)/hello_world/build/bootloader/bootloader.bin + PARTITION_TABLE=$(IDF_PATH)/hello_world/build/partition_table/partition-table.bin +endif ifeq ($(CONFIG_ESP32CORE_FLASH_IMAGE),y) define POSTBUILD @@ -38,12 +45,14 @@ define POSTBUILD echo "run make again to create the nuttx.bin image."; \ else \ echo "Generating: $(NUTTXNAME).bin (ESP32 compatible)"; \ - esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o nuttx.bin nuttx; \ + esptool.py --chip esp32 elf2image --flash_mode dio --flash_size 4MB -o $(NUTTXNAME).bin nuttx; \ echo "Generated: $(NUTTXNAME).bin (ESP32 compatible)"; \ echo "Generating: flash_image.bin"; \ + echo " Bootloader: $(BOOTLOADER)"; \ + echo " Parition Table: $(PARTITION_TABLE)"; \ dd if=/dev/zero bs=1024 count=4096 of=flash_image.bin && \ - dd if=$(IDF_PATH)/hello_world/build/bootloader/bootloader.bin bs=1 seek=$(shell printf "%d" 0x1000) of=flash_image.bin conv=notrunc && \ - dd if=$(IDF_PATH)/hello_world/build/partition_table/partition-table.bin bs=1 seek=$(shell printf "%d" 0x8000) of=flash_image.bin conv=notrunc && \ + dd if=$(BOOTLOADER) bs=1 seek=$(shell printf "%d" 0x1000) of=flash_image.bin conv=notrunc && \ + dd if=$(PARTITION_TABLE) bs=1 seek=$(shell printf "%d" 0x8000) of=flash_image.bin conv=notrunc && \ dd if=$(NUTTXNAME).bin bs=1 seek=$(shell printf "%d" 0x10000) of=flash_image.bin conv=notrunc && \ echo "Generated: flash_image.bin (it can be run with 'qemu-system-xtensa -nographic -machine esp32 -drive file=flash_image.bin,if=mtd,format=raw')"; \ fi