You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/05/02 06:12:48 UTC
[incubator-nuttx] branch master updated (bb29541 -> b29efe4)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from bb29541 Remove garbage file accidentally added
new 8e21568 build.yml: Remove all tail space character
new b29efe4 .asf.yaml: Disable squash and merge option
The 2 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:
.asf.yaml | 8 ++++----
.github/workflows/build.yml | 28 ++++++++++++++--------------
2 files changed, 18 insertions(+), 18 deletions(-)
[incubator-nuttx] 01/02: build.yml: Remove all tail space character
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8e2156859b944ceba9acad07be7d48243fb4deaf
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat May 2 11:59:52 2020 +0800
build.yml: Remove all tail space character
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
.github/workflows/build.yml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9913fd3..32bb4e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,17 +31,17 @@ jobs:
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/* ]]
@@ -52,7 +52,7 @@ jobs:
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
@@ -61,23 +61,23 @@ jobs:
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:
@@ -85,7 +85,7 @@ jobs:
ref: ${{ steps.gittargets.outputs.os_ref }}
path: sources/nuttx
fetch-depth: 1
-
+
- name: Checkout apps repo
uses: actions/checkout@v2
with:
@@ -93,7 +93,7 @@ jobs:
ref: ${{ steps.gittargets.outputs.apps_ref }}
path: sources/apps
fetch-depth: 1
-
+
- name: Checkout testing repo
uses: actions/checkout@v2
with:
@@ -125,7 +125,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, mips-riscv-x86-xtensa, 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, mips-riscv-x86-xtensa, sim]
steps:
- name: Fetch Cached Source
@@ -153,7 +153,7 @@ jobs:
login-server: docker.pkg.github.com
username: ${GITHUB_ACTOR}
password: ${{ secrets.GITHUB_TOKEN }}
-
+
- name: Docker Pull
uses: nick-invision/retry@v1
with:
@@ -161,7 +161,7 @@ jobs:
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:
[incubator-nuttx] 02/02: .asf.yaml: Disable squash and merge option
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b29efe430799c738db1c71a103380cb224beb796
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat May 2 12:00:58 2020 +0800
.asf.yaml: Disable squash and merge option
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
.asf.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index a325ddb..c1200bb 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -14,9 +14,9 @@ github:
- mcu
- microcontroller
enabled_merge_buttons:
- # enable squash button:
- squash: true
- # enable merge button:
- merge: true
+ # disable squash button:
+ squash: false
+ # disable merge button:
+ merge: false
# enable rebase button:
rebase: true