Skip to content

Commit 62d86de

Browse files
Working branch merge. (#1)
* Clean up and merge.
1 parent 0ca009d commit 62d86de

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

.gitattributes

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/linux.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,49 @@ name: linux
55
on: [push, pull_request]
66

77
jobs:
8-
TestSomething:
8+
rubocop:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
1212
- uses: ruby/setup-ruby@v1
1313
with:
1414
ruby-version: 2.6
1515

16-
# Install and run Arduino CI tests for TestSomething
16+
# Install and run Arduino CI tests for rubocop
1717
- name: Build and Execute
1818
run: |
1919
g++ -v
2020
bundle install
2121
bundle exec rubocop --version
2222
bundle exec rubocop -D .
2323
bundle exec rspec --backtrace
24+
25+
TestSomething:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: 2.6
32+
33+
# Install and run Arduino CI tests for TestSomething
34+
- name: Build and Execute
35+
run: |
36+
g++ -v
37+
bundle install
2438
cd SampleProjects/TestSomething
2539
bundle install
2640
bundle exec arduino_ci.rb
2741
28-
Network:
42+
NetworkLib:
2943
runs-on: ubuntu-latest
3044
steps:
3145
- uses: actions/checkout@v2
3246
- uses: ruby/setup-ruby@v1
3347
with:
3448
ruby-version: 2.6
3549

36-
# Install and run Arduino CI tests for Network
50+
# Install and run Arduino CI tests for NetworkLib
3751
- name: Build and Execute
3852
run: |
3953
g++ -v

.github/workflows/windows.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,41 @@ name: windows
55
on: [push, pull_request]
66

77
jobs:
8-
TestSomething:
8+
rubocop:
99
runs-on: windows-latest
1010
steps:
1111
- uses: actions/checkout@v2
1212
- uses: ruby/setup-ruby@v1
1313
with:
1414
ruby-version: 2.6
1515

16-
# Install and run Arduino CI tests for TestSomething
16+
# Install and run Arduino CI tests for rubocop
1717
- name: Build and Execute
1818
run: |
1919
g++ -v
2020
bundle install
2121
bundle exec rubocop --version
2222
bundle exec rubocop -D .
2323
bundle exec rspec --backtrace
24+
25+
TestSomething:
26+
runs-on: windows-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: 2.6
32+
33+
# Install and run Arduino CI tests for TestSomething
34+
- name: Build and Execute
35+
run: |
36+
g++ -v
37+
bundle install
2438
cd SampleProjects/TestSomething
2539
bundle install
2640
bundle exec arduino_ci.rb
2741
28-
Network:
42+
NetworkLib:
2943
runs-on: windows-latest
3044
steps:
3145
- uses: actions/checkout@v2
@@ -39,6 +53,6 @@ jobs:
3953
g++ -v
4054
bundle install
4155
cd SampleProjects/NetworkLib
42-
./scripts/install.sh
56+
bash -x ./scripts/install.sh
4357
bundle install
4458
bundle exec arduino_ci.rb

SampleProjects/NetworkLib/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# then get the custom one we want to use for testing
55
cd $(bundle exec arduino_library_location.rb)
66
if [ ! -d ./Ethernet ] ; then
7-
git clone https://github.com/Arduino-CI/Ethernet.git
7+
git clone --depth 1 https://github.com/Arduino-CI/Ethernet.git
88
fi

0 commit comments

Comments
 (0)