Skip to content

Run CI using image built in incubator-nuttx-testing and enable esp32 build #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 2 commits into from
Mar 28, 2020
Merged

Run CI using image built in incubator-nuttx-testing and enable esp32 build #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c8c47
Use new images
btashton Mar 15, 2020
3b003d4
Pull the ESP32 binary blobs from a configurable path
btashton Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/actions/ci-container/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 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

@xiaoxiang781216 xiaoxiang781216 Mar 28, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add linux into the name to distinguish the upcoming windows doc?
And we need add copyright in this file too.

@btashton btashton Mar 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add the copyright, but I will probably just expose an input to the action so that it can have the correct container tag used. I would like to wait until we know how that will work, I have not done windows builds in a container via github actions, I have only done them on the runner directly.

runs:
using: 'docker'
image: 'docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux'
args:
- "-c"
- ${{ inputs.run }}
27 changes: 20 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ on:
jobs:
check:
runs-on: ubuntu-18.04
container: liuguo09/ubuntu-nuttx:18.04

steps:
- name: Checkout nuttx repo
Expand Down Expand Up @@ -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-xtensa, sim]
steps:
- name: Checkout nuttx repo
uses: actions/checkout@v2
Expand All @@ -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

@xiaoxiang781216 xiaoxiang781216 Mar 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Run builds already use ci-container at line 104, why we need another similar "Run Pull Container"?

@btashton btashton Mar 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is basically zero cost. I left this so that we can see what the time for pull is, I'm worried that this is going to get quite large so I want to be able to keep an eye on it outside of test execution. It will be local after this so the next step does not have to download again.

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
15 changes: 12 additions & 3 deletions boards/xtensa/esp32/esp32-core/scripts/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down