You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2023/09/26 07:43:12 UTC
[mynewt-nimble] branch master updated: ci: Build tests under standard project folder tree
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new f9c3512d ci: Build tests under standard project folder tree
f9c3512d is described below
commit f9c3512d2a687130c16b725ae83a1c0ca3946169
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Sep 25 15:41:54 2023 +0200
ci: Build tests under standard project folder tree
This uses standard folder tree to build tests (where nimble is in
repos folder, and not as a top project folder).
---
.github/project.yml | 28 ++---------
.github/project_ports.yml | 56 ----------------------
.github/targets/nordic_pca10028_blehci/pkg.yml | 4 +-
.github/targets/nordic_pca10056_btshell/pkg.yml | 4 +-
.github/targets/nordic_pca10095_btshell/pkg.yml | 4 +-
.github/targets_linux/native_btshell/pkg.yml | 2 +-
.github/targets_linux/nordic_pca10028_boot/pkg.yml | 4 +-
.../nordic_pca10028_bt5_blehci/pkg.yml | 4 +-
.../nordic_pca10056-blehci-usb/pkg.yml | 2 +-
.../nordic_pca10056_advertiser/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blecent/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blecsc/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blehci/pkg.yml | 2 +-
.../nordic_pca10056_blehci_all_enabled/pkg.yml | 2 +-
.../nordic_pca10056_blehci_no_privacy/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blehr/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blemesh/pkg.yml | 2 +-
.../nordic_pca10056_blemesh_cdb/pkg.yml | 2 +-
.../nordic_pca10056_blemesh_ext_adv/pkg.yml | 2 +-
.../nordic_pca10056_blemesh_light/pkg.yml | 2 +-
.../pkg.yml | 2 +-
.../pkg.yml | 2 +-
.../nordic_pca10056_blemesh_shell/pkg.yml | 2 +-
.../nordic_pca10056_blemesh_storage/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_bleprph/pkg.yml | 2 +-
.../nordic_pca10056_bleprph_oic/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_blesplit/pkg.yml | 2 +-
.../targets_linux/nordic_pca10056_bleuart/pkg.yml | 2 +-
.../nordic_pca10056_btshell_2M/pkg.yml | 2 +-
.../nordic_pca10056_btshell_2M_coded/pkg.yml | 2 +-
.../nordic_pca10056_btshell_all/pkg.yml | 4 +-
.../nordic_pca10056_btshell_all_v52/pkg.yml | 4 +-
.../nordic_pca10056_btshell_coded/pkg.yml | 2 +-
.../nordic_pca10056_btshell_ext_adv/pkg.yml | 2 +-
.../nordic_pca10056_btshell_periodic_adv/pkg.yml | 2 +-
.../nordic_pca10056_btshell_sm_legacy/pkg.yml | 2 +-
.../nordic_pca10056_btshell_sm_none/pkg.yml | 2 +-
.../nordic_pca10056_btshell_sm_sc/pkg.yml | 2 +-
.../nordic_pca10056_btshell_sm_sc_legacy/pkg.yml | 2 +-
.../nordic_pca10056_btshell_xtal_settle_0/pkg.yml | 4 +-
.../targets_linux/nordic_pca10056_bttester/pkg.yml | 4 +-
.github/targets_linux/nordic_pca10056_dtm/pkg.yml | 4 +-
.../nordic_pca10056_ext_advertiser/pkg.yml | 4 +-
.../targets_linux/nordic_pca10056_scanner/pkg.yml | 2 +-
.../targets_linux/nordic_pca10095_blehci/pkg.yml | 4 +-
.github/workflows/build_ports.yml | 3 ++
.github/workflows/build_targets.yml | 36 ++++++++------
.github/workflows/compliance_check.yml | 4 ++
.github/workflows/newt_test_all.yml | 23 +++++----
.github/workflows/ports_syscfg_check.yml | 25 +++++-----
50 files changed, 117 insertions(+), 168 deletions(-)
diff --git a/.github/project.yml b/.github/project.yml
index 10eb2dfc..4d813741 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -6,7 +6,7 @@
# to you 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,
@@ -17,34 +17,16 @@
# under the License.
#
-project.name: "apache-mynewt-nimble"
+project.name: "my_project"
project.repositories:
- apache-mynewt-core
- - mcuboot
- - apache-mynewt-mcumgr
+# Use github's distribution mechanism for core ASF libraries.
+# This provides mirroring automatically for us.
+#
repository.apache-mynewt-core:
type: github
vers: 0.0.0
user: apache
repo: mynewt-core
-
-repository.mcuboot:
- type: github
- vers: 0.0.0
- user: mcu-tools
- repo: mcuboot
- branch: main
-
-repository.apache-mynewt-mcumgr:
- type: github
- vers: 0.0.0
- user: apache
- repo: mynewt-mcumgr
-
-repository.tinyusb:
- type: github
- vers: 0.0.0
- user: hathach
- repo: tinyusb
diff --git a/.github/project_ports.yml b/.github/project_ports.yml
deleted file mode 100644
index 0a9b2cf0..00000000
--- a/.github/project_ports.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-#
-
-project.name: "apache-mynewt-nimble"
-
-project.repositories:
- - apache-mynewt-core
- - mcuboot
- - apache-mynewt-mcumgr
-
-repository.apache-mynewt-core:
- type: github
- vers: 0.0.0
- user: apache
- repo: mynewt-core
-
-repository.apache-mynewt-nimble:
- type: github
- vers: 0.0.0
- user: apache
- repo: mynewt-nimble
-
-repository.mcuboot:
- type: github
- vers: 0.0.0
- user: mcu-tools
- repo: mcuboot
- branch: main
-
-repository.apache-mynewt-mcumgr:
- type: github
- vers: 0.0.0
- user: apache
- repo: mynewt-mcumgr
-
-repository.tinyusb:
- type: github
- vers: 0.0.0
- user: hathach
- repo: tinyusb
diff --git a/.github/targets/nordic_pca10028_blehci/pkg.yml b/.github/targets/nordic_pca10028_blehci/pkg.yml
index b3504c3d..1cf0a362 100644
--- a/.github/targets/nordic_pca10028_blehci/pkg.yml
+++ b/.github/targets/nordic_pca10028_blehci/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/blehci-nordic_pca10028
-pkg.name: "targets_ci/nordic_pca10028_blehci"
+### Package: "targets/blehci-nordic_pca10028
+pkg.name: "targets/nordic_pca10028_blehci"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets/nordic_pca10056_btshell/pkg.yml b/.github/targets/nordic_pca10056_btshell/pkg.yml
index 287ca4e3..adcbd699 100644
--- a/.github/targets/nordic_pca10056_btshell/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell
-pkg.name: "targets_ci/nordic_pca10056_btshell"
+### Package: "targets/nordic_pca10056_btshell
+pkg.name: "targets/nordic_pca10056_btshell"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets/nordic_pca10095_btshell/pkg.yml b/.github/targets/nordic_pca10095_btshell/pkg.yml
index 889405d3..c669e30e 100644
--- a/.github/targets/nordic_pca10095_btshell/pkg.yml
+++ b/.github/targets/nordic_pca10095_btshell/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell
-pkg.name: "targets_ci/nordic_pca10095_btshell"
+### Package: "targets/nordic_pca10056_btshell
+pkg.name: "targets/nordic_pca10095_btshell"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/native_btshell/pkg.yml b/.github/targets_linux/native_btshell/pkg.yml
index 870ccae9..a2525255 100644
--- a/.github/targets_linux/native_btshell/pkg.yml
+++ b/.github/targets_linux/native_btshell/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: targets_ci/native_btshell
+pkg.name: targets/native_btshell
pkg.type: target
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10028_boot/pkg.yml b/.github/targets_linux/nordic_pca10028_boot/pkg.yml
index 6cf0c922..de320d8b 100644
--- a/.github/targets_linux/nordic_pca10028_boot/pkg.yml
+++ b/.github/targets_linux/nordic_pca10028_boot/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10028_boot
-pkg.name: "targets_ci/nordic_pca10028_boot"
+### Package: "targets/nordic_pca10028_boot
+pkg.name: "targets/nordic_pca10028_boot"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml b/.github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
index 80774bfd..02bb6e8e 100644
--- a/.github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
+++ b/.github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10028_bt5_blehci
-pkg.name: "targets_ci/nordic_pca10028_bt5_blehci"
+### Package: "targets/nordic_pca10028_bt5_blehci
+pkg.name: "targets/nordic_pca10028_bt5_blehci"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml b/.github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
index 4f92d9b9..2c8307d3 100644
--- a/.github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
@@ -16,7 +16,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056-blehci-usb"
+pkg.name: "targets/nordic_pca10056-blehci-usb"
pkg.type: target
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_advertiser/pkg.yml b/.github/targets_linux/nordic_pca10056_advertiser/pkg.yml
index 6de3362b..84d0c05b 100644
--- a/.github/targets_linux/nordic_pca10056_advertiser/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_advertiser/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_advertiser"
+pkg.name: "targets/nordic_pca10056_advertiser"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blecent/pkg.yml b/.github/targets_linux/nordic_pca10056_blecent/pkg.yml
index 64dbe8b5..d47c0544 100644
--- a/.github/targets_linux/nordic_pca10056_blecent/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blecent/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blecent"
+pkg.name: "targets/nordic_pca10056_blecent"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blecsc/pkg.yml b/.github/targets_linux/nordic_pca10056_blecsc/pkg.yml
index 65a125ca..f26c7df6 100644
--- a/.github/targets_linux/nordic_pca10056_blecsc/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blecsc/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blecsc"
+pkg.name: "targets/nordic_pca10056_blecsc"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blehci/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci/pkg.yml
index 204f4a5f..b66dab98 100644
--- a/.github/targets_linux/nordic_pca10056_blehci/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blehci/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blehci"
+pkg.name: "targets/nordic_pca10056_blehci"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml
index 6ede68c2..c44ac282 100644
--- a/.github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blehci_all_enabled"
+pkg.name: "targets/nordic_pca10056_blehci_all_enabled"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml
index ed7e725d..539a3640 100644
--- a/.github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blehci_no_privacy"
+pkg.name: "targets/nordic_pca10056_blehci_no_privacy"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blehr/pkg.yml b/.github/targets_linux/nordic_pca10056_blehr/pkg.yml
index aa37aa0e..fd7e6fa9 100644
--- a/.github/targets_linux/nordic_pca10056_blehr/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blehr/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blehr"
+pkg.name: "targets/nordic_pca10056_blehr"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh/pkg.yml
index 04f35835..b1785b01 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh"
+pkg.name: "targets/nordic_pca10056_blemesh"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
index 1c059a40..2a85a988 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_cdb"
+pkg.name: "targets/nordic_pca10056_blemesh_cdb"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml
index 1f8c88d3..3fec50f6 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_ext_adv"
+pkg.name: "targets/nordic_pca10056_blemesh_ext_adv"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml
index cfb98f67..991cccfd 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_light"
+pkg.name: "targets/nordic_pca10056_blemesh_light"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml
index 68b8325b..38c54781 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_models_example_1"
+pkg.name: "targets/nordic_pca10056_blemesh_models_example_1"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml
index 2944216a..b17b6525 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_models_example_2"
+pkg.name: "targets/nordic_pca10056_blemesh_models_example_2"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml
index e0bb36a9..4636feb4 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_shell"
+pkg.name: "targets/nordic_pca10056_blemesh_shell"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml
index 7a04e49a..ff17acfc 100644
--- a/.github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blemesh_storage"
+pkg.name: "targets/nordic_pca10056_blemesh_storage"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_bleprph/pkg.yml b/.github/targets_linux/nordic_pca10056_bleprph/pkg.yml
index 4beaa1fc..d1e7b95e 100644
--- a/.github/targets_linux/nordic_pca10056_bleprph/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_bleprph/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_bleprph"
+pkg.name: "targets/nordic_pca10056_bleprph"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml b/.github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
index 2c2f231e..aef9c2eb 100644
--- a/.github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_bleprph_oic"
+pkg.name: "targets/nordic_pca10056_bleprph_oic"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_blesplit/pkg.yml b/.github/targets_linux/nordic_pca10056_blesplit/pkg.yml
index d62ab79c..8781b07a 100644
--- a/.github/targets_linux/nordic_pca10056_blesplit/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_blesplit/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_blesplit"
+pkg.name: "targets/nordic_pca10056_blesplit"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_bleuart/pkg.yml b/.github/targets_linux/nordic_pca10056_bleuart/pkg.yml
index 0ae1073d..f3f3ce92 100644
--- a/.github/targets_linux/nordic_pca10056_bleuart/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_bleuart/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_bleuart"
+pkg.name: "targets/nordic_pca10056_bleuart"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
index e5555756..fc2db1d0 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_2M"
+pkg.name: "targets/nordic_pca10056_btshell_2M"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml
index a0b8ad88..0ddee925 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_2M_coded"
+pkg.name: "targets/nordic_pca10056_btshell_2M_coded"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_all/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
index 5ac5cc77..4a867f7a 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell_all
-pkg.name: "targets_ci/nordic_pca10056_btshell_all"
+### Package: "targets/nordic_pca10056_btshell_all
+pkg.name: "targets/nordic_pca10056_btshell_all"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
index e218c511..d677ba1c 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell_all_v52
-pkg.name: "targets_ci/nordic_pca10056_btshell_all_v52"
+### Package: "targets/nordic_pca10056_btshell_all_v52
+pkg.name: "targets/nordic_pca10056_btshell_all_v52"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml
index 87a1eb64..c3ec70a3 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_coded"
+pkg.name: "targets/nordic_pca10056_btshell_coded"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml
index b39ebae1..c8cce299 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_ext_adv"
+pkg.name: "targets/nordic_pca10056_btshell_ext_adv"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml
index 3a3a7d1e..b4f519e2 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_periodic_adv"
+pkg.name: "targets/nordic_pca10056_btshell_periodic_adv"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml
index 79dbec44..4c3d331e 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_sm_legacy"
+pkg.name: "targets/nordic_pca10056_btshell_sm_legacy"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml
index 1061c2fa..a8ccee1f 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_sm_none"
+pkg.name: "targets/nordic_pca10056_btshell_sm_none"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml
index 0de16539..611096aa 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_sm_sc"
+pkg.name: "targets/nordic_pca10056_btshell_sm_sc"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
index e7583601..3983ec0c 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_btshell_sm_sc_legacy"
+pkg.name: "targets/nordic_pca10056_btshell_sm_sc_legacy"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
index 2dde3239..aeb3d88b 100644
--- a/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell_xtal_settle_0
-pkg.name: "targets_ci/nordic_pca10056_btshell_xtal_settle_0"
+### Package: "targets/nordic_pca10056_btshell_xtal_settle_0
+pkg.name: "targets/nordic_pca10056_btshell_xtal_settle_0"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_bttester/pkg.yml b/.github/targets_linux/nordic_pca10056_bttester/pkg.yml
index 5f72b58d..56a5f686 100644
--- a/.github/targets_linux/nordic_pca10056_bttester/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_bttester/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_bttester
-pkg.name: "targets_ci/nordic_pca10056_bttester"
+### Package: "targets/nordic_pca10056_bttester
+pkg.name: "targets/nordic_pca10056_bttester"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_dtm/pkg.yml b/.github/targets_linux/nordic_pca10056_dtm/pkg.yml
index 9cbab324..9fde92a6 100644
--- a/.github/targets_linux/nordic_pca10056_dtm/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_dtm/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_dtm
-pkg.name: "targets_ci/nordic_pca10056_dtm"
+### Package: "targets/nordic_pca10056_dtm
+pkg.name: "targets/nordic_pca10056_dtm"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml b/.github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml
index 7a196568..23a8c144 100644
--- a/.github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/nordic_pca10056_btshell
-pkg.name: "targets_ci/nordic_pca10056_ext_advertiser"
+### Package: "targets/nordic_pca10056_btshell
+pkg.name: "targets/nordic_pca10056_ext_advertiser"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10056_scanner/pkg.yml b/.github/targets_linux/nordic_pca10056_scanner/pkg.yml
index 04b210a8..dfc3c8b0 100644
--- a/.github/targets_linux/nordic_pca10056_scanner/pkg.yml
+++ b/.github/targets_linux/nordic_pca10056_scanner/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: "targets_ci/nordic_pca10056_scanner"
+pkg.name: "targets/nordic_pca10056_scanner"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/targets_linux/nordic_pca10095_blehci/pkg.yml b/.github/targets_linux/nordic_pca10095_blehci/pkg.yml
index 2cb827ec..21fa5f2c 100644
--- a/.github/targets_linux/nordic_pca10095_blehci/pkg.yml
+++ b/.github/targets_linux/nordic_pca10095_blehci/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-### Package: "targets_ci/blehci-nordic_pca10095
-pkg.name: "targets_ci/nordic_pca10095_blehci"
+### Package: "targets/blehci-nordic_pca10095
+pkg.name: "targets/nordic_pca10095_blehci"
pkg.type: "target"
pkg.description:
pkg.author:
diff --git a/.github/workflows/build_ports.yml b/.github/workflows/build_ports.yml
index 70a33495..8c49d1f5 100644
--- a/.github/workflows/build_ports.yml
+++ b/.github/workflows/build_ports.yml
@@ -31,16 +31,19 @@ jobs:
with:
release: '12.2.Rel1'
- name: Install Dependencies
+ shell: bash
run: |
sudo apt-get update
sudo apt-get install -y make ccache gcc-multilib g++-multilib
- name: Build example ports
+ shell: bash
run: |
make -C porting/examples/dummy/ clean all
make -C porting/examples/linux/ clean all
make -C porting/examples/linux_blemesh/ clean all
make -C porting/npl/linux/test/ clean all test
- name: Build RIOT port
+ shell: bash
if: success() || failure()
continue-on-error: true
run: |
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
index 05b13eb9..b666a0cb 100644
--- a/.github/workflows/build_targets.yml
+++ b/.github/workflows/build_targets.yml
@@ -38,33 +38,41 @@ jobs:
with:
release: '12.2.Rel1'
- name: Install Dependencies
+ shell: bash
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y gcc-multilib
- name: Install newt
+ shell: bash
run: |
go version
go install mynewt.apache.org/newt/newt@latest
- name: Setup project
+ shell: bash
run: |
- cp .github/project.yml project.yml
- mkdir repos
- git clone --depth=1 https://github.com/apache/mynewt-core repos/apache-mynewt-core
- git clone --depth=1 https://github.com/mcu-tools/mcuboot.git repos/mcuboot
- git clone --depth=1 https://github.com/apache/mynewt-mcumgr repos/apache-mynewt-mcumgr
- git clone --depth=1 https://github.com/hathach/tinyusb.git repos/tinyusb
- git clone --depth=1 https://github.com/NordicSemiconductor/nrfx --branch v2.11.0 repos/nordic-nrfx
- git clone --depth=1 https://github.com/Mbed-TLS/mbedtls.git --branch v2.28.4 repos/mbedtls
+ newt new build
+ cp -f .github/project.yml build/project.yml
+ cd build
+ newt upgrade --shallow=1
+ rm -rf targets
+ rm -rf repos/apache-mynewt-nimble
+ git clone .. repos/apache-mynewt-nimble
+ cd ..
- name: Build targets
shell: bash
run: |
- cp -r .github/targets targets_ci
- ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q targets_ci/$0'
- rm -rf targets_ci
+ cp -r .github/targets build/targets
+ cd build
+ ls targets | xargs -n1 sh -c 'echo "Testing $0"; newt build -q $0'
+ rm -rf targets
+ cd ..
- name: Build Linux-only targets
+ shell: bash
if: matrix.os == 'ubuntu-latest'
run: |
- cp -r .github/targets_linux targets_ci
- ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q targets_ci/$0'
- rm -rf targets_ci
+ cp -r .github/targets_linux build/targets
+ cd build
+ ls targets | xargs -n1 sh -c 'echo "Testing $0"; newt build -q $0'
+ rm -rf targets
+ cd ..
diff --git a/.github/workflows/compliance_check.yml b/.github/workflows/compliance_check.yml
index 71ac7f1c..c76225a8 100644
--- a/.github/workflows/compliance_check.yml
+++ b/.github/workflows/compliance_check.yml
@@ -30,12 +30,14 @@ jobs:
with:
fetch-depth: 0
- name: Install Dependencies
+ shell: bash
run: |
sudo apt-get update
sudo apt-get install -y uncrustify
mkdir repos
git clone --depth=1 https://github.com/apache/mynewt-core repos/apache-mynewt-core
- name: check style
+ shell: bash
run: |
./repos/apache-mynewt-core/.github/check_style.py
@@ -47,6 +49,7 @@ jobs:
with:
fetch-depth: 0
- name: Install Dependencies
+ shell: bash
run: |
sudo apt-get update
sudo apt-get install -y libxml2-utils
@@ -58,5 +61,6 @@ jobs:
VERSION=`xmllint --xpath "//snapshotVersion[1]/value/text()" version.xml`
wget https://repository.apache.org/content/repositories/snapshots/org/apache/rat/apache-rat/$SNAPSHOT/apache-rat-$VERSION.jar -O apache-rat.jar
- name: check licensing
+ shell: bash
run: |
./repos/apache-mynewt-core/.github/check_license.py
diff --git a/.github/workflows/newt_test_all.yml b/.github/workflows/newt_test_all.yml
index 44bf6014..8299b54d 100644
--- a/.github/workflows/newt_test_all.yml
+++ b/.github/workflows/newt_test_all.yml
@@ -31,22 +31,27 @@ jobs:
with:
go-version: 'stable'
- name: Install Dependencies
+ shell: bash
run: |
sudo apt-get update
sudo apt-get install -y gcc-multilib
- name: Install newt
+ shell: bash
run: |
go version
go install mynewt.apache.org/newt/newt@latest
- name: Setup project
+ shell: bash
run: |
- cp .github/project.yml project.yml
- mkdir repos
- git clone --depth=1 https://github.com/apache/mynewt-core repos/apache-mynewt-core
- git clone --depth=1 https://github.com/mcu-tools/mcuboot.git repos/mcuboot
- git clone --depth=1 https://github.com/apache/mynewt-mcumgr repos/apache-mynewt-mcumgr
- git clone --depth=1 https://github.com/hathach/tinyusb.git repos/tinyusb
- git clone --depth=1 https://github.com/NordicSemiconductor/nrfx --branch v2.11.0 repos/nordic-nrfx
- git clone --depth=1 https://github.com/Mbed-TLS/mbedtls.git --branch v2.28.4 repos/mbedtls
+ newt new build
+ cp -f .github/project.yml build/project.yml
+ cd build
+ newt upgrade --shallow=1
+ rm -rf repos/apache-mynewt-nimble
+ git clone .. repos/apache-mynewt-nimble
+ cd ..
- name: newt test all
- run: newt test all
+ shell: bash
+ run: |
+ cd build
+ newt test all
diff --git a/.github/workflows/ports_syscfg_check.yml b/.github/workflows/ports_syscfg_check.yml
index e3c41633..66d47a23 100644
--- a/.github/workflows/ports_syscfg_check.yml
+++ b/.github/workflows/ports_syscfg_check.yml
@@ -34,35 +34,38 @@ jobs:
with:
release: '12.2.Rel1'
- name: Install Dependencies
+ shell: bash
run: |
sudo apt-get update
sudo apt-get install -y gcc-multilib
- name: Install newt
+ shell: bash
run: |
go version
go install mynewt.apache.org/newt/newt@latest
- name: Setup project
+ shell: bash
run: |
- mkdir /tmp/proj
- mkdir /tmp/proj/repos
- cp .github/project_ports.yml /tmp/proj/project.yml
- git clone --depth=1 https://github.com/apache/mynewt-core /tmp/proj/repos/apache-mynewt-core
- git clone --depth=1 https://github.com/mcu-tools/mcuboot.git /tmp/proj/repos/mcuboot
- git clone --depth=1 https://github.com/apache/mynewt-mcumgr /tmp/proj/repos/apache-mynewt-mcumgr
- git clone --depth=1 https://github.com/hathach/tinyusb.git /tmp/proj/repos/tinyusb
- git clone --depth=1 https://github.com/NordicSemiconductor/nrfx --branch v2.11.0 repos/nordic-nrfx
- git clone --depth=1 https://github.com/Mbed-TLS/mbedtls.git --branch v2.28.4 repos/mbedtls
- cp -r `pwd` /tmp/proj/repos/apache-mynewt-nimble
+ newt new build
+ cp -f .github/project.yml build/project.yml
+ cd build
+ newt upgrade --shallow=1
+ rm -rf repos/apache-mynewt-nimble
+ git clone .. repos/apache-mynewt-nimble
+ cd ..
- name: Build ports tests targets
+ shell: bash
run: |
- cd /tmp/proj
+ cd build
./repos/apache-mynewt-nimble/porting/update_generated_files.sh
cd repos/apache-mynewt-nimble
- name: Check ports syscfg (debug)
+ shell: bash
if: runner.debug == '1'
run: |
git diff
- name: Check ports syscfg
+ shell: bash
run: |
git diff --quiet || (\
echo -e "\033[0;31mChanges in system configration files detected.";