Skip to content

Commit

Permalink
ci: Build tests under standard project folder tree
Browse files Browse the repository at this point in the history
This uses standard folder tree to build tests (where nimble is in
repos folder, and not as a top project folder).
  • Loading branch information
sjanc committed Sep 25, 2023
1 parent acc3ee9 commit ab82bc2
Show file tree
Hide file tree
Showing 48 changed files with 94 additions and 167 deletions.
28 changes: 5 additions & 23 deletions .github/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
56 changes: 0 additions & 56 deletions .github/project_ports.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/targets/nordic_pca10028_blehci/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets/nordic_pca10056_btshell/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets/nordic_pca10095_btshell/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/native_btshell/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets_linux/nordic_pca10028_boot/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_advertiser/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blecent/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blecsc/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blehci/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blehr/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blemesh/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_bleprph/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_blesplit/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_bleuart/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading

0 comments on commit ab82bc2

Please sign in to comment.