Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
michallenc committed Jun 15, 2021
2 parents fa28337 + ca0f2bd commit ac4b81c
Show file tree
Hide file tree
Showing 11,085 changed files with 469,050 additions and 304,206 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
25 changes: 25 additions & 0 deletions .github/actions/ci-container/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 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
inputs:
run: # id of input
description: 'Commands to run'
required: true
runs:
using: 'docker'
image: 'docker.pkg.github.com/apache/incubator-nuttx/apache-nuttx-ci-linux'
args:
- "/bin/bash"
- "-ce"
- ${{ inputs.run }}
9 changes: 9 additions & 0 deletions .github/linters/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[flake8]
ignore = W503,W605
max-complexity = 27
max-line-length = 125
show-source = True
statistics = True

[isort]
profile = black
28 changes: 9 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
id: gittargets
shell: bash
run: |
TESTING_REF="master" # Always use master for testing
OS_REF=""
APPS_REF=""
Expand Down Expand Up @@ -80,7 +79,6 @@ jobs:
echo ::set-output name=os_ref::$OS_REF
echo ::set-output name=apps_ref::$APPS_REF
echo ::set-output name=testing_ref::$TESTING_REF
- name: Checkout nuttx repo
uses: actions/checkout@v2
Expand All @@ -100,14 +98,6 @@ jobs:
path: sources/apps
fetch-depth: 1

- name: Checkout testing repo
uses: actions/checkout@v2
with:
repository: apache/incubator-nuttx-testing
ref: ${{ steps.gittargets.outputs.testing_ref }}
path: sources/testing
fetch-depth: 1

- name: Tar sources
run: tar zcf sources.tar.gz sources
- name: Archive Source Bundle
Expand All @@ -124,7 +114,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, other, 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, other, risc-v, sim-01, sim-02, xtensa]

steps:
- name: Download Source Artifact
Expand All @@ -142,20 +132,20 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Pull
run: docker pull docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux
run: docker pull docker.pkg.github.com/apache/incubator-nuttx/apache-nuttx-ci-linux
- name: Export NuttX Repo SHA
run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
- name: Run builds
uses: ./sources/testing/.github/actions/ci-container
uses: ./sources/nuttx/.github/actions/ci-container
env:
BLOBDIR: /tools/blobs
with:
run: |
echo "::add-matcher::sources/nuttx/.github/gcc.json"
export CCACHE_DIR=`pwd`/ccache
mkdir $CCACHE_DIR
cd sources/testing
export ARTIFACTDIR=`pwd`/../../buildartifacts
export ARTIFACTDIR=`pwd`/buildartifacts
cd sources/nuttx/tools/ci
./cibuild.sh -A -c testlist/${{matrix.boards}}.dat
ccache -s
- uses: actions/upload-artifact@v2
Expand All @@ -169,7 +159,7 @@ jobs:
needs: Fetch-Source
strategy:
matrix:
boards: [arm-12, other, sim]
boards: [macos, sim-01, sim-02]
steps:
- name: Download Source Artifact
uses: actions/download-artifact@v1
Expand All @@ -185,7 +175,7 @@ jobs:
cache-name: ${{ runner.os }}-cache-tools
with:
path: prebuilt
key: ${{ runner.os }}-tools-${{ hashFiles('./sources/testing/cibuild.sh') }}
key: ${{ runner.os }}-tools-${{ hashFiles('./sources/nuttx/tools/ci/cibuild.sh') }}

- name: Export NuttX Repo SHA
run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
Expand All @@ -194,8 +184,8 @@ jobs:
echo "::add-matcher::sources/nuttx/.github/gcc.json"
export CCACHE_DIR=`pwd`/ccache
mkdir $CCACHE_DIR
cd sources/testing
export ARTIFACTDIR=`pwd`/../../buildartifacts
export ARTIFACTDIR=`pwd`/buildartifacts
cd sources/nuttx/tools/ci
./cibuild.sh -i -A -c testlist/${{matrix.boards}}.dat
ccache -s
- uses: actions/upload-artifact@v2
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Cancelling Duplicates
on:
workflow_run:
workflows: ["Build", "Check", "Build Documentation", " Lint", "Docker-Linux"]
types: ['requested']

jobs:
cancel-duplicate-workflow-runs:
name: "Cancel duplicate workflow runs"
runs-on: ubuntu-latest
steps:
- uses: apache/airflow-cancel-workflow-runs@master
name: "Cancel duplicate workflow runs"
with:
cancelMode: allDuplicates
token: ${{ secrets.GITHUB_TOKEN }}
sourceRunId: ${{ github.event.workflow_run.id }}
2 changes: 0 additions & 2 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ jobs:
pip3 install pipenv
pipenv install
pipenv run make html
# This step flakes frequently so still annotate errors but dont fail the build
pipenv run make linkcheck || true
- uses: actions/upload-artifact@v2
with:
name: sphinx-docs
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/docker_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# 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: Docker-Linux

on:
push:
# Publish `master` as Docker `latest` image.
branches:
- master
paths:
- 'tools/ci/docker/linux/**'
- '.github/workflows/docker_linux.yml'

# Run builds for any PRs.
pull_request:
paths:
- 'tools/ci/docker/linux/**'
- '.github/workflows/docker_linux.yml'

env:
IMAGE_NAME: apache-nuttx-ci-linux

jobs:
# Push image to GitHub Packages.
push:
runs-on: ubuntu-latest
env:
DOCKER_BUILDKIT: 1
IMAGE_TAG: docker.pkg.github.com/${{ github.repository }}/apache-nuttx-ci-linux
steps:
- uses: actions/checkout@v2

- name: Log into registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin

- name: Build Linux image
run: |
echo "Building Linux Image using cache from $IMAGE_TAG"
docker build \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--cache-from $IMAGE_TAG \
--tag $IMAGE_TAG \
-f ./tools/ci/docker/linux/Dockerfile ./tools/ci/docker/
- name: Push Linux image
if: (github.event_name == 'push') && (github.ref == 'refs/heads/master')
run: |
docker push $IMAGE_TAG
19 changes: 14 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
name: ❄️ Lint
name: Lint

on: [pull_request]

jobs:
yamllint:
name: 🍺 YAML
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: 🧹 YAML Lint
with:
fetch-depth: 0
- run: mkdir super-linter.report
- name: Lint
uses: github/super-linter@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_ALL_CODEBASE: false
VALIDATE_PYTHON_BLACK: true
VALIDATE_PYTHON_FLAKE8: true
PYTHON_FLAKE8_CONFIG_FILE: setup.cfg
VALIDATE_PYTHON_ISORT: true
PYTHON_ISORT_CONFIG_FILE: setup.cfg
VALIDATE_YAML: true
FILTER_REGEX_INCLUDE: .*\.github/.*
94 changes: 94 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
This is a list of all the contributors tha have submitted ICLA, SGA
If you are not on this list and believe you should be, please inform us.

ICLA
====
Abdelatif Guettouche
Adam Porter
Alan Carvalho de Assis
Alin Jerpelea
Anthony Merlino
Beat Kung
Chao An
David S. Alessio
David Sidrane
Dong Heng
Goden Freemans
Guiding Li
Gwenhael Goavec
Haitao Liu
Henry Adam Feuer (Adam Feuer)
Herman A Glenn (Hal Glenn)
Ivan Petrov Ucherdzhiev (Ivan Ucherdzhiev)
Jacob A Dahl (Jacob Dahl)
Jaehyuk Cho
Janne Rosberg
Johannes Schock
Jose Pablo Carballo
Jukka Laitinen
Junmin Kim
Ken Pettit
Laurent Latil
Manuel Stuhn
Marc Rechte
Marc Rosen
Marco Krahl
Mark Schulte
Martin Lederhilger
Masatoshi Ueno
Masayuki Ishikawa
Mateusz Tomasz Szafoni (Mateusz Szafoni)
Matias Nitsche
Matous Pokorny
Matthew Trescott
Mattias Edlund
Michael Jung
Michal Lyszczek
Miguel Ángel Herranz Trillo (Miguel Herranz)
Mihai Serban
Neil Hancock
Nicholas Elliot Chin (Nicholas Chin)
Oki Minabe
Paul Alexander Patience (Paul A. Patience)
Petro Karashchenko
Pierre-Noel Bouteville
Pierre-Olivier Vauboin (PO Vauboin)
Richard Cochran
Robert A. Feretich (Bob Feretich)
Sakari Matias Kapanen (Sakari Kapanen)
Sara da Cunha Monteiro de Souza (Sara Monteiro)
Sebastian Ene
Sebastien Lorquet
Sergey Nikitenko
Takashi Yamamoto (Yamamoto Takashi)
Thomas Axelsson
Uros Platise
Vasilijev Alexand Anatoljevich (Alexander Vasiliev)
Wolfgang Gerd Reißnegger (Wolfgang Reißnegger)
Xiang Xiao
Yuuichi Nakamura

CCLA
====
Starcat LLC (Adam Feuer)

SGA
===
2G Engineering
Actia Nordic AB
Beijing Xiaomi Mobile Software Co., Ltd
Bouffalo Lab (Nanjing) Co., Ltd.
Datavision S.R.O.
DS Automotion GmbH
Espressif Systems (Shanghai) Co. Ltd.
Falker Atomação Agrícola Ltda
Gregory Ellis Nutt
Max Holtzberg
RAF Research LLC
Software Grant from Uniquix Technologia Ltda
Sony
Zhu Yan Lin

NOTE:
To avoid spam the email addresses can be retrieved from git history

3 changes: 3 additions & 0 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ help:

html: clean

autobuild: clean
sphinx-autobuild . _build -j=8

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
Expand Down
1 change: 1 addition & 0 deletions Documentation/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ m2r2 = "*"
sphinx_rtd_theme = "*"
Sphinx = "*"
sphinx-tabs = "*"
sphinx-autobuild = "*"

[requires]
python_version = "3"
Loading

0 comments on commit ac4b81c

Please sign in to comment.