Skip to content

Commit bb25c28

Browse files
committed
Merge branch 'master' of https://github.com/Arduino-CI/arduino_ci into wire
2 parents f2fd95a + f32ba70 commit bb25c28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1751
-597
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text eol=lf

.rubocop.yml

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ Layout/ExtraSpacing:
3131
Layout/EndOfLine:
3232
EnforcedStyle: lf
3333

34+
Layout/EndAlignment:
35+
EnforcedStyleAlignWith: start_of_line
36+
37+
Layout/CaseIndentation:
38+
EnforcedStyle: end
39+
3440
Metrics/LineLength:
3541
Description: Limit lines to 80 characters.
3642
StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits

.travis.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,10 @@ script:
2626
- bundle exec rspec --backtrace
2727
- cd SampleProjects/TestSomething
2828
- bundle install
29-
- bundle exec arduino_ci_remote.rb
29+
- bundle exec arduino_ci.rb
30+
- cd ../NetworkLib
31+
- cd scripts
32+
- bash -x ./install.sh
33+
- cd ..
34+
- bundle install
35+
- bundle exec arduino_ci.rb

CHANGELOG.md

+22-4

README.md

+10-7

REFERENCE.md

+51-9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
depends=OnePointOhDummy,OnePointFiveDummy

SampleProjects/DependOnSomething/src/YesDeps.cpp

Whitespace-only changes.

SampleProjects/DependOnSomething/src/YesDeps.h

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <ArduinoUnitTests.h>
2+
3+
unittest(nothing)
4+
{
5+
}
6+
7+
unittest_main()

SampleProjects/DoSomething/.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ sudo: false
22
language: ruby
33
script:
44
- bundle install
5-
- bundle exec arduino_ci_remote.rb
5+
- bundle exec arduino_ci.rb

SampleProjects/DoSomething/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
unittest:
2+
exclude_dirs:
3+
- src/excludeThis
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name=TestSomething
2+
version=0.1.0
3+
author=Ian Katz <[email protected]>
4+
maintainer=Ian Katz <[email protected]>
5+
sentence=Arduino CI unit test example
6+
paragraph=A skeleton library demonstrating file exclusion
7+
category=Other
8+
url=https://github.com/Arduino-CI/arduino_ci/SampleProjects/ExcludeSomething
9+
architectures=avr,esp8266
10+
includes=do-something.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "exclude-something.h"
2+
int excludeSomething(void) {
3+
return -1;
4+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
#include <Arduino.h>
3+
int excludeSomething(void);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <ArduinoUnitTests.h>
2+
3+
unittest(nothing)
4+
{
5+
}
6+
7+
unittest_main()
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
unittest:
2+
platforms:
3+
- mega2560
4+
libraries:
5+
- "Ethernet"
6+
7+
compile:
8+
platforms:
9+
- mega2560
10+
libraries:
11+
- "Ethernet"

SampleProjects/NetworkLib/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.bundle

SampleProjects/NetworkLib/Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source 'https://rubygems.org'
2+
gem 'arduino_ci', path: '../../'

SampleProjects/NetworkLib/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <NetworkLib.h>
2+
// if it seems bare, that's because it's only meant to
3+
// demonstrate compilation -- that references work
4+
void setup() {}
5+
6+
void loop() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name=Ethernet
2+
version=0.1.0
3+
author=James Foster <[email protected]>
4+
maintainer=James Foster <[email protected]>
5+
sentence=Sample Ethernet library to validate Client/Server mocks
6+
paragraph=Sample Ethernet library to validate Client/Server mocks
7+
category=Other
8+
url=https://github.com/Arduino-CI/arduino_ci/SampleProjects/Ethernet
9+
architectures=avr,esp8266
10+
includes=NetworkLib.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
# if we don't have an Ethernet library already (say, in new install or for an automated test),
4+
# then get the custom one we want to use for testing
5+
cd $(bundle exec arduino_library_location.rb)
6+
if [ ! -d ./Ethernet ] ; then
7+
git clone https://github.com/Arduino-CI/Ethernet.git
8+
fi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "Ethernet.h"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
3+
#include <Arduino.h>
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
cd SampleProjects/NetworkLib
3+
bundle config --local path vendor/bundle
4+
bundle install
5+
bundle exec arduino_ci.rb --skip-examples-compilation
6+
*/
7+
8+
#include <Arduino.h>
9+
#include <ArduinoUnitTests.h>
10+
#include <Ethernet.h>
11+
12+
unittest(test) { assertEqual(EthernetNoHardware, Ethernet.hardwareStatus()); }
13+
14+
unittest_main()

SampleProjects/OnePointFiveDummy/NoBase.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/NoBase.h

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/library.properties

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/src/YesSrc.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/src/YesSrc.h

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/src/subdir/YesSubdir.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/src/subdir/YesSubdir.h

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <ArduinoUnitTests.h>
2+
3+
unittest(nothing)
4+
{
5+
}
6+
7+
unittest_main()

SampleProjects/OnePointFiveDummy/utility/ImNotHere.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveDummy/utility/ImNotHere.h

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/YesBase.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/YesBase.h

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/src/ImNotHere.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/src/ImNotHere.h

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/utility/YesUtil.cpp

Whitespace-only changes.

SampleProjects/OnePointFiveMalformed/utility/YesUtil.h

Whitespace-only changes.
+1

SampleProjects/OnePointOhDummy/YesBase.cpp

Whitespace-only changes.

SampleProjects/OnePointOhDummy/YesBase.h

Whitespace-only changes.

SampleProjects/OnePointOhDummy/src/ImNotHere.cpp

Whitespace-only changes.

SampleProjects/OnePointOhDummy/src/ImNotHere.h

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <ArduinoUnitTests.h>
2+
3+
unittest(nothing)
4+
{
5+
}
6+
7+
unittest_main()

SampleProjects/OnePointOhDummy/utility/YesUtil.cpp

Whitespace-only changes.

SampleProjects/OnePointOhDummy/utility/YesUtil.h

Whitespace-only changes.

0 commit comments

Comments
 (0)