Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ name: linux
on: [push, pull_request]

jobs:
"BusIO_with_dependencies":
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
- name: Check usage - Test BusIO from scratch
run: |
g++ -v
cd SampleProjects/BusIO
bundle install
bundle exec ensure_arduino_installation.rb
bundle exec arduino_ci.rb

"rubocop":
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed

### Fixed
- Fixes #352, in which the Arduino backend was being referenced in the CI runner before being explicitly assigned; this affected all tests of modules that used `library.properties` to specify runtime Arduino module dependencies.

### Security

Expand Down
5 changes: 2 additions & 3 deletions SampleProjects/BusIO/.arduino-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ unittest:
platforms:
- mega2560
libraries:
- "Adafruit BusIO"
# - "Adafruit_BusIO" <= This works if you have the library pre-installed
- "Adafruit_BusIO"

compile:
platforms:
- mega2560
libraries:
- "Adafruit BusIO"
- "Adafruit_BusIO"
6 changes: 5 additions & 1 deletion SampleProjects/BusIO/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# BusIO

This is an example of a library that depends on Adafruit BusIO.
It is provided to help reproduce #192.
It is provided to help reproduce #192 and #352.

This example specifies a dependency in `library.properties`, which
exercises the `arduino_ci.rb` CI runner in a way that the other
SampleProjects currently do not.
1 change: 1 addition & 0 deletions SampleProjects/BusIO/library.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ category=Other
url=https://github.com/Arduino-CI/arduino_ci/SampleProjects/BusIO
architectures=avr,esp8266
includes=BusIO.h
depends=Adafruit BusIO
11 changes: 6 additions & 5 deletions exe/arduino_ci.rb
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,6 @@ def perform_bootstrap
end
end

install_arduino_library_dependencies(
cpp_library.arduino_library_dependencies,
"<#{ArduinoCI::CppLibrary::LIBRARY_PROPERTIES_FILE}>"
)

# return all objects needed by other steps
{
backend: backend,
Expand Down Expand Up @@ -604,6 +599,12 @@ def perform_example_compilation_tests(cpp_library, config)

strap = perform_bootstrap
@backend = strap[:backend]

install_arduino_library_dependencies(
strap[:cpp_library].arduino_library_dependencies,
"<#{ArduinoCI::CppLibrary::LIBRARY_PROPERTIES_FILE}>"
)

perform_unit_tests(strap[:cpp_library], strap[:config])
perform_example_compilation_tests(strap[:cpp_library], strap[:config])

Expand Down