You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/23 23:04:40 UTC
[incubator-nuttx] branch releases/9.0 updated (cb16dfb -> ca367a2)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from cb16dfb Update release notes in preparation for the 9.0.0 release.
new 0b8fe43 CI: refine checkpatch commits in check.yml
new a1f1c53 Add retry to pull docker image
new 60ec2b4 build.yml: Remove the tail space
new ac880be build.yaml: Change arm-11 to arm-12
new ca367a2 CI: Add logic for determining which branches of OS App and Testing repos should be used
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yml | 266 ++++++++++++++++++++++++++++++--------------
.github/workflows/check.yml | 5 +-
2 files changed, 185 insertions(+), 86 deletions(-)
[incubator-nuttx] 05/05: CI: Add logic for determining which
branches of OS App and Testing repos should be used
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ca367a259b89a1d289e15f9fdbb6e16c2d41471e
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Thu Apr 23 00:40:21 2020 -0700
CI: Add logic for determining which branches of OS App and Testing repos should be used
---
.github/workflows/build.yml | 272 +++++++++++++++++++++++++++++---------------
1 file changed, 182 insertions(+), 90 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 625ca99..d59c9e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,109 +14,201 @@ name: Build
on:
pull_request:
+ push:
+ branches:
+ - master
+ - 'releases/*'
+ tags:
jobs:
+ Fetch-Source:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Determine Target Branches
+ id: gittargets
+ shell: bash
+ run: |
+ TESTING_REF="master" # Always use master for testing
+ OS_REF=""
+ APPS_REF=""
+
+ REF=$GITHUB_REF
+
+ # If a base ref is set this is a PR and we will want to use
+ # the base ref instead of the ref that triggered the event
+ if [ ${GITHUB_BASE_REF} ]; then
+ REF=refs/heads/$GITHUB_BASE_REF
+ fi
+
+ echo "Working with ref: $REF"
+
+ # We modify for all tags and release branches
+ if [[ $REF =~ refs/heads/releases/*|refs/tags/* ]]; then
+ if [[ $REF =~ refs/heads/* ]]
+ then
+ REF_NAME=${REF##refs/heads/}
+ echo "Working with a branch: $REF_NAME"
+ else
+ REF_NAME=${REF##refs/tags/}
+ echo "Working with a tag: $REF_NAME"
+ fi
+
+ # Determine the repo and leave that unset to use the normal checkout behavior
+ # of using the merge commit instead of HEAD
+ case $GITHUB_REPOSITORY in
+ "apache/incubator-nuttx")
+ # OS
+ echo "Triggered by change in OS"
+ APPS_REF=$REF_NAME
+ ;;
+
+ "apache/incubator-nuttx-apps" )
+ # APPS
+ OS_REF=$REF_NAME
+ echo "Triggered by change in APPS"
+ ;;
+
+ *)
+ echo "Trigger by change on $GITHUB_REPOSITORY. This is unexpected."
+ ;;
+ esac
+ fi
+
+ 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
+ with:
+ repository: apache/incubator-nuttx
+ ref: ${{ steps.gittargets.outputs.os_ref }}
+ path: sources/nuttx
+ fetch-depth: 1
+
+ - name: Checkout apps repo
+ uses: actions/checkout@v2
+ with:
+ repository: apache/incubator-nuttx-apps
+ ref: ${{ steps.gittargets.outputs.apps_ref }}
+ 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: Create Source Bundle
+ run: tar -czf sources.tar.gz sources
+ - name: Archive Source Bundle
+ uses: actions/upload-artifact@v1
+ with:
+ name: source-bundle
+ path: sources.tar.gz
+
+ - name: Cache Source
+ id: cache-source
+ uses: actions/cache@v1
+ with:
+ path: sources
+ key: build-sources-${{ github.run_id }}
+
Linux:
- runs-on: ubuntu-18.04
+ needs: Fetch-Source
+ runs-on: ubuntu-latest
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, mips-riscv-x86-xtensa, sim]
- steps:
- - name: Checkout nuttx repo
- uses: actions/checkout@v2
- with:
- repository: apache/incubator-nuttx
- path: nuttx
- fetch-depth: 0
-
- - name: Fetch nuttx tags
- run: |
- cd nuttx
- git fetch --tags
+ 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, mips-riscv-x86-xtensa, sim]
- - name: Checkout apps repo
- uses: actions/checkout@v2
- with:
- repository: apache/incubator-nuttx-apps
- path: apps
- fetch-depth: 0
-
- - name: Checkout testing repo
- uses: actions/checkout@v2
- with:
- 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: Docker Pull
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 10
- max_attempts: 3
- retry_wait_seconds: 10
- command: docker pull docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux
-
- - name: Run builds
- uses: ./testing/.github/actions/ci-container
- env:
- BLOBDIR: /tools/blobs
- with:
- run: |
- cd testing
- ./cibuild.sh -x -G testlist/${{matrix.boards}}.dat
+ steps:
+ - name: Fetch Cached Source
+ id: cache-source
+ uses: actions/cache@v1
+ with:
+ path: sources-cache
+ key: build-sources-${{ github.run_id }}
+ - name: Prevent Updating Source Cache
+ if: steps.cache-source.outputs.cache-hit == 'true'
+ run: mv sources-cache sources
+ - name: Download Source Artifact
+ if: steps.cache-source.outputs.cache-hit != 'true'
+ uses: actions/download-artifact@v1
+ with:
+ name: source-bundle
+ path: ./
+ - name: Extract Source Artifact
+ if: steps.cache-source.outputs.cache-hit != 'true'
+ run: tar -xf sources.tar.gz
+
+ - name: Docker Login
+ uses: azure/docker-login@v1
+ with:
+ login-server: docker.pkg.github.com
+ username: ${GITHUB_ACTOR}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Docker Pull
+ uses: nick-invision/retry@v1
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 10
+ command: docker pull docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux
+
+ - name: Run builds
+ uses: ./sources/testing/.github/actions/ci-container
+ env:
+ BLOBDIR: /tools/blobs
+ with:
+ run: |
+ git -C sources/nuttx fetch --tags
+ cd sources/testing
+ ./cibuild.sh -x -G testlist/${{matrix.boards}}.dat
macOS:
runs-on: macos-10.15
-
+ needs: Fetch-Source
strategy:
matrix:
boards: [arm-12, mips-riscv-x86-xtensa, sim]
-
steps:
- - name: Checkout nuttx repo
- uses: actions/checkout@v2
- with:
- repository: apache/incubator-nuttx
- path: nuttx
- fetch-depth: 0
-
- - name: Fetch nuttx tags
- run: |
- cd nuttx
- git fetch --tags
-
- - name: Checkout apps repo
- uses: actions/checkout@v2
- with:
- repository: apache/incubator-nuttx-apps
- path: apps
- fetch-depth: 0
-
- - name: Checkout testing repo
- uses: actions/checkout@v2
- with:
- repository: apache/incubator-nuttx-testing
- path: testing
-
- - name: Restore cache
- id: cache-tools
- uses: actions/cache@v1
- env:
- cache-name: ${{ runner.os }}-cache-tools
- with:
- path: prebuilt
- key: ${{ runner.os }}-tools-${{ hashFiles('./testing/cibuild.sh') }}
-
- - name: Run builds
- run: |
- cd testing
- ./cibuild.sh -i -x -G testlist/${{matrix.boards}}.dat
+ - name: Fetch Cached Source
+ id: cache-source
+ uses: actions/cache@v1
+ with:
+ path: sources-cache
+ key: build-sources-${{ github.run_id }}
+ - name: Prevent Updating Source Cache
+ if: steps.cache-source.outputs.cache-hit == 'true'
+ run: mv sources-cache sources
+ - name: Download Source Artifact
+ if: steps.cache-source.outputs.cache-hit != 'true'
+ uses: actions/download-artifact@v1
+ with:
+ name: source-bundle
+ path: ./
+ - name: Extract Source Artifact
+ if: steps.cache-source.outputs.cache-hit != 'true'
+ run: tar -xf sources.tar.gz
+
+ - name: Restore Tools Cache
+ id: cache-tools
+ uses: actions/cache@v1
+ env:
+ cache-name: ${{ runner.os }}-cache-tools
+ with:
+ path: prebuilt
+ key: ${{ runner.os }}-tools-${{ hashFiles('./sources/testing/cibuild.sh') }}
+
+ - name: Run Builds
+ run: |
+ git -C sources/nuttx fetch --tags
+ cd sources/testing
+ ./cibuild.sh -i -x -G testlist/${{matrix.boards}}.dat
[incubator-nuttx] 04/05: build.yaml: Change arm-11 to arm-12
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ac880be495e524cefc21090e816967fb0c6196d3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 19 21:34:53 2020 +0800
build.yaml: Change arm-11 to arm-12
since arm-12 finish more quickly than arm-11
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3395d45..625ca99 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
- boards: [arm-11, mips-riscv-x86-xtensa, sim]
+ boards: [arm-12, mips-riscv-x86-xtensa, sim]
steps:
- name: Checkout nuttx repo
[incubator-nuttx] 03/05: build.yml: Remove the tail space
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 60ec2b408cceb7e208bf9af6bf4abefbd406e9c6
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Apr 18 19:46:07 2020 +0800
build.yml: Remove the tail space
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 269c127..3395d45 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
login-server: docker.pkg.github.com
username: ${GITHUB_ACTOR}
password: ${{ secrets.GITHUB_TOKEN }}
-
+
- name: Docker Pull
uses: nick-invision/retry@v1
with:
[incubator-nuttx] 02/05: Add retry to pull docker image
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a1f1c53856e3090ec81aa2457915ecd2837d2be0
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Fri Apr 17 10:02:34 2020 -0700
Add retry to pull docker image
Signed-off-by: Brennan Ashton <ba...@brennanashton.com>
---
.github/workflows/build.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82532fb..269c127 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,14 @@ jobs:
login-server: docker.pkg.github.com
username: ${GITHUB_ACTOR}
password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Docker Pull
+ uses: nick-invision/retry@v1
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 10
+ command: docker pull docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux
- name: Run builds
uses: ./testing/.github/actions/ci-container
[incubator-nuttx] 01/05: CI: refine checkpatch commits in check.yml
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0b8fe43a691aeebed2b6c7def90bb59b3e35f1d8
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Apr 16 17:33:12 2020 +0800
CI: refine checkpatch commits in check.yml
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
.github/workflows/check.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e208e26..242496a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -30,8 +30,7 @@ jobs:
- name: Check Pull Request
run: |
cd nuttx
- ranges=`git log -1 --merges --pretty=format:%P | awk -F" " '{ print $1 ".." $2 }'`
- git log --oneline $ranges
- commits=`git log --reverse --format=format:%H $ranges`
+ commits=`git log -1 --merges --pretty=format:%P | awk -F" " '{ print $1 ".." $2 }'`
+ git log --oneline $commits
echo "../nuttx/tools/checkpatch.sh -g $commits"
../nuttx/tools/checkpatch.sh -g $commits