diff --git a/.github/project.yml b/.github/project.yml index 10eb2dfce2..4d81374169 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 0a9b2cf01b..0000000000 --- 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 b3504c3d90..1cf0a3629c 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 287ca4e3c3..adcbd6990a 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 889405d345..c669e30ea3 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 870ccae9ca..a252525536 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 6cf0c922e3..de320d8b7a 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 80774bfd45..02bb6e8e4e 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 4f92d9b96a..2c8307d3df 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 6de3362b52..84d0c05b34 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 64dbe8b51a..d47c0544da 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 65a125ca35..f26c7df69a 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 204f4a5f36..b66dab9879 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 6ede68c23a..c44ac2824a 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 ed7e725dd1..539a36409e 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 aa37aa0e1c..fd7e6fa90d 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 04f35835ae..b1785b01b5 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 1c059a402e..2a85a98817 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 1f8c88d3b8..3fec50f689 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 cfb98f674a..991cccfd73 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 68b8325b87..38c54781ae 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 2944216a51..b17b652583 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 e0bb36a941..4636feb41a 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 7a04e49ac5..ff17acfcc0 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 4beaa1fca0..d1e7b95eea 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 2c2f231e58..aef9c2eb2e 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 d62ab79c46..8781b07ae0 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 0ae1073dec..f3f3ce922d 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 e555575641..fc2db1d019 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 a0b8ad888a..0ddee925fb 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 5ac5cc77d9..4a867f7aa9 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 e218c511c1..d677ba1c24 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 87a1eb64cf..c3ec70a308 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 b39ebae190..c8cce29975 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 3a3a7d1eb3..b4f519e241 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 79dbec4447..4c3d331ebe 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 1061c2fa83..a8ccee1f45 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 0de1653943..611096aa36 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 e75836015e..3983ec0cae 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 2dde3239c3..aeb3d88b39 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 5f72b58da8..56a5f686eb 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 9cbab32434..9fde92a61e 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 7a196568ee..23a8c1446f 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 04b210a878..dfc3c8b015 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 2cb827ecb4..21fa5f2cd7 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_targets.yml b/.github/workflows/build_targets.yml index 05b13eb94f..6ab9c9be1d 100644 --- a/.github/workflows/build_targets.yml +++ b/.github/workflows/build_targets.yml @@ -47,24 +47,29 @@ jobs: 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 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/newt_test_all.yml b/.github/workflows/newt_test_all.yml index 44bf601494..a2eff2413d 100644 --- a/.github/workflows/newt_test_all.yml +++ b/.github/workflows/newt_test_all.yml @@ -40,13 +40,12 @@ jobs: go install mynewt.apache.org/newt/newt@latest - name: Setup project 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 diff --git a/.github/workflows/ports_syscfg_check.yml b/.github/workflows/ports_syscfg_check.yml index e3c41633a4..b261cfa5eb 100644 --- a/.github/workflows/ports_syscfg_check.yml +++ b/.github/workflows/ports_syscfg_check.yml @@ -43,19 +43,16 @@ jobs: go install mynewt.apache.org/newt/newt@latest - name: Setup project 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 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)