From 4186fd0583e6a0c19bed9b4321ae07a002d66932 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 15:48:08 -0800 Subject: [PATCH 01/15] Testing alternate run script. --- .gitattributes | 2 ++ .github/workflows/windows.yaml | 20 +++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..4cab1f4d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index a7978001..d7b82dec 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -34,14 +34,12 @@ jobs: ruby-version: 2.6 # Install and run Arduino CI tests for Network - - name: Build and Execute - run: | - g++ -v - bundle install - bundle exec rubocop --version - bundle exec rubocop -D . - bundle exec rspec --backtrace - cd SampleProjects/NetworkLib - ./scripts/install.sh - bundle install - bundle exec arduino_ci.rb + - run: g++ -v + - run: bundle install + - run: bundle exec rubocop --version + - run: bundle exec rubocop -D . + - run: bundle exec rspec --backtrace + - run: cd SampleProjects/NetworkLib + - run: ./scripts/install.sh + - run: bundle install + - run: bundle exec arduino_ci.rb From 89cf0ce395c7729f5d3b40530a190ef650d577fa Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 15:56:09 -0800 Subject: [PATCH 02/15] Linux file endings --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 4cab1f4d..4282322a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ # Set the default behavior, in case people don't have core.autocrlf set. -* text=auto +* text eol=lf From ee7511b820048b45f726dcb38c1ca5b21df4bb02 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 16:06:51 -0800 Subject: [PATCH 03/15] Combine run steps --- .github/workflows/windows.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index d7b82dec..b050bad0 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -39,7 +39,8 @@ jobs: - run: bundle exec rubocop --version - run: bundle exec rubocop -D . - run: bundle exec rspec --backtrace - - run: cd SampleProjects/NetworkLib - - run: ./scripts/install.sh - - run: bundle install - - run: bundle exec arduino_ci.rb + - run: | + cd SampleProjects/NetworkLib + ./scripts/install.sh + bundle install + bundle exec arduino_ci.rb From 942ece0a5c0d3494470798a905190a5a781a9610 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 16:19:06 -0800 Subject: [PATCH 04/15] More debug info --- .github/workflows/windows.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index b050bad0..1c98f9b2 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -21,6 +21,7 @@ jobs: bundle exec rubocop --version bundle exec rubocop -D . bundle exec rspec --backtrace + echo "After backtrace" cd SampleProjects/TestSomething bundle install bundle exec arduino_ci.rb @@ -36,11 +37,11 @@ jobs: # Install and run Arduino CI tests for Network - run: g++ -v - run: bundle install - - run: bundle exec rubocop --version - - run: bundle exec rubocop -D . - - run: bundle exec rspec --backtrace - run: | cd SampleProjects/NetworkLib + echo "Before ./scripts/install.sh" ./scripts/install.sh + echo "Before bundle install" bundle install + echo "Before bundle exec arduino_ci.rb" bundle exec arduino_ci.rb From ff9cee928998d4ed7fa83d67ce59059c89f73c31 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 17:00:15 -0800 Subject: [PATCH 05/15] More debug info --- SampleProjects/NetworkLib/scripts/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SampleProjects/NetworkLib/scripts/install.sh b/SampleProjects/NetworkLib/scripts/install.sh index b4e2dd40..f48349f6 100755 --- a/SampleProjects/NetworkLib/scripts/install.sh +++ b/SampleProjects/NetworkLib/scripts/install.sh @@ -2,7 +2,11 @@ # if we don't have an Ethernet library already (say, in new install or for an automated test), # then get the custom one we want to use for testing +echo "Inside install script" cd $(bundle exec arduino_library_location.rb) +pwd if [ ! -d ./Ethernet ] ; then - git clone https://github.com/Arduino-CI/Ethernet.git + echo "Before clone" + git clone -v --depth 1 https://github.com/Arduino-CI/Ethernet.git + echo "Complete clone" fi From 3daf094e2e324ad4030d419f2b8437538395cbb0 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 17:06:53 -0800 Subject: [PATCH 06/15] More debug info --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 1c98f9b2..ad406bed 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -40,7 +40,7 @@ jobs: - run: | cd SampleProjects/NetworkLib echo "Before ./scripts/install.sh" - ./scripts/install.sh + bash -x ./scripts/install.sh echo "Before bundle install" bundle install echo "Before bundle exec arduino_ci.rb" From 5bcf7074d76076d9a0737dcd27ef971989ce6b6c Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 17:17:02 -0800 Subject: [PATCH 07/15] Alternate download for git repo --- .github/workflows/windows.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index ad406bed..e96bee22 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -34,8 +34,15 @@ jobs: with: ruby-version: 2.6 - # Install and run Arduino CI tests for Network - run: g++ -v + - run: echo $(bundle exec arduino_library_location.rb) + + - uses: actions/checkout@v2 + with: + repository: 'Arduino-CI/Ethernet' + path: 'Library/' + + # Install and run Arduino CI tests for Network - run: bundle install - run: | cd SampleProjects/NetworkLib From 71e5e74bdd759b0136733e46bef8543a01e550ab Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 17:21:13 -0800 Subject: [PATCH 08/15] Alternate download for git repo --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index e96bee22..27233eab 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -35,7 +35,7 @@ jobs: ruby-version: 2.6 - run: g++ -v - - run: echo $(bundle exec arduino_library_location.rb) + - run: bundle exec arduino_library_location.rb - uses: actions/checkout@v2 with: From 670d9f2511d0be91ef7c739efe82beac4b19fac1 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 17:23:00 -0800 Subject: [PATCH 09/15] Alternate download for git repo --- .github/workflows/windows.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 27233eab..c9f8c7e4 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -34,6 +34,8 @@ jobs: with: ruby-version: 2.6 + # Install and run Arduino CI tests for Network + - run: bundle install - run: g++ -v - run: bundle exec arduino_library_location.rb @@ -42,8 +44,6 @@ jobs: repository: 'Arduino-CI/Ethernet' path: 'Library/' - # Install and run Arduino CI tests for Network - - run: bundle install - run: | cd SampleProjects/NetworkLib echo "Before ./scripts/install.sh" From b5f869760df598aa088fc9871260007246294dbf Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:02:17 -0800 Subject: [PATCH 10/15] Saving with out debug info: --- .github/workflows/windows.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index c9f8c7e4..9e3a8141 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -21,7 +21,7 @@ jobs: bundle exec rubocop --version bundle exec rubocop -D . bundle exec rspec --backtrace - echo "After backtrace" + # echo "After backtrace" cd SampleProjects/TestSomething bundle install bundle exec arduino_ci.rb @@ -37,18 +37,17 @@ jobs: # Install and run Arduino CI tests for Network - run: bundle install - run: g++ -v - - run: bundle exec arduino_library_location.rb - - - uses: actions/checkout@v2 - with: - repository: 'Arduino-CI/Ethernet' - path: 'Library/' + # - run: bundle exec arduino_library_location.rb + # - uses: actions/checkout@v2 + # with: + # repository: 'Arduino-CI/Ethernet' + # path: 'Library/' - run: | cd SampleProjects/NetworkLib - echo "Before ./scripts/install.sh" + # echo "Before ./scripts/install.sh" bash -x ./scripts/install.sh - echo "Before bundle install" + # echo "Before bundle install" bundle install - echo "Before bundle exec arduino_ci.rb" + # echo "Before bundle exec arduino_ci.rb" bundle exec arduino_ci.rb From 8621618aff20aafbac63bfd2c4573e94e3b8a71e Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:13:26 -0800 Subject: [PATCH 11/15] Remove debug. --- .gitattributes | 2 -- .github/workflows/windows.yaml | 10 ---------- SampleProjects/NetworkLib/scripts/install.sh | 4 ---- 3 files changed, 16 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 4282322a..00000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Set the default behavior, in case people don't have core.autocrlf set. -* text eol=lf diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 9e3a8141..964e8b25 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -21,7 +21,6 @@ jobs: bundle exec rubocop --version bundle exec rubocop -D . bundle exec rspec --backtrace - # echo "After backtrace" cd SampleProjects/TestSomething bundle install bundle exec arduino_ci.rb @@ -37,17 +36,8 @@ jobs: # Install and run Arduino CI tests for Network - run: bundle install - run: g++ -v - # - run: bundle exec arduino_library_location.rb - - # - uses: actions/checkout@v2 - # with: - # repository: 'Arduino-CI/Ethernet' - # path: 'Library/' - run: | cd SampleProjects/NetworkLib - # echo "Before ./scripts/install.sh" bash -x ./scripts/install.sh - # echo "Before bundle install" bundle install - # echo "Before bundle exec arduino_ci.rb" bundle exec arduino_ci.rb diff --git a/SampleProjects/NetworkLib/scripts/install.sh b/SampleProjects/NetworkLib/scripts/install.sh index f48349f6..d99d592f 100755 --- a/SampleProjects/NetworkLib/scripts/install.sh +++ b/SampleProjects/NetworkLib/scripts/install.sh @@ -2,11 +2,7 @@ # if we don't have an Ethernet library already (say, in new install or for an automated test), # then get the custom one we want to use for testing -echo "Inside install script" cd $(bundle exec arduino_library_location.rb) -pwd if [ ! -d ./Ethernet ] ; then - echo "Before clone" git clone -v --depth 1 https://github.com/Arduino-CI/Ethernet.git - echo "Complete clone" fi From 44e0462b6ca178e61397996a47cc3e6db3adc3ec Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:28:42 -0800 Subject: [PATCH 12/15] Saving split up tests. --- .github/workflows/linux.yaml | 21 ++++++++++++++++----- .github/workflows/windows.yaml | 21 ++++++++++++++++++--- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 91b5a597..b8c64a91 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -5,7 +5,7 @@ name: linux on: [push, pull_request] jobs: - TestSomething: + rubocop: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -13,7 +13,7 @@ jobs: with: ruby-version: 2.6 - # Install and run Arduino CI tests for TestSomething + # Install and run Arduino CI tests for rubocop - name: Build and Execute run: | g++ -v @@ -21,6 +21,20 @@ jobs: bundle exec rubocop --version bundle exec rubocop -D . bundle exec rspec --backtrace + + TestSomething: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + # Install and run Arduino CI tests for TestSomething + - name: Build and Execute + run: | + g++ -v + bundle install cd SampleProjects/TestSomething bundle install bundle exec arduino_ci.rb @@ -38,9 +52,6 @@ jobs: run: | g++ -v bundle install - bundle exec rubocop --version - bundle exec rubocop -D . - bundle exec rspec --backtrace cd SampleProjects/NetworkLib ./scripts/install.sh bundle install diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 964e8b25..3e773582 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -5,7 +5,7 @@ name: windows on: [push, pull_request] jobs: - TestSomething: + rubocop: runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -13,7 +13,7 @@ jobs: with: ruby-version: 2.6 - # Install and run Arduino CI tests for TestSomething + # Install and run Arduino CI tests for rubocop - name: Build and Execute run: | g++ -v @@ -21,6 +21,20 @@ jobs: bundle exec rubocop --version bundle exec rubocop -D . bundle exec rspec --backtrace + + TestSomething: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + # Install and run Arduino CI tests for TestSomething + - name: Build and Execute + run: | + g++ -v + bundle install cd SampleProjects/TestSomething bundle install bundle exec arduino_ci.rb @@ -36,7 +50,8 @@ jobs: # Install and run Arduino CI tests for Network - run: bundle install - run: g++ -v - - run: | + - name: Build and Execute + run: | cd SampleProjects/NetworkLib bash -x ./scripts/install.sh bundle install From 640950c78d5f1eeac62a8b01fd926f8da34f5272 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:30:41 -0800 Subject: [PATCH 13/15] Removing gitattributes --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 4282322a..00000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Set the default behavior, in case people don't have core.autocrlf set. -* text eol=lf From 05a4fd11156cf416d04d1087fcca37c4abae94d8 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:38:53 -0800 Subject: [PATCH 14/15] One more name clean up --- .github/workflows/linux.yaml | 4 ++-- .github/workflows/windows.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index b8c64a91..15d7bf83 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -39,7 +39,7 @@ jobs: bundle install bundle exec arduino_ci.rb - Network: + NetworkLib: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -47,7 +47,7 @@ jobs: with: ruby-version: 2.6 - # Install and run Arduino CI tests for Network + # Install and run Arduino CI tests for NetworkLib - name: Build and Execute run: | g++ -v diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 3e773582..5eb4410a 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -39,7 +39,7 @@ jobs: bundle install bundle exec arduino_ci.rb - Network: + NetworkLib: runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -48,10 +48,10 @@ jobs: ruby-version: 2.6 # Install and run Arduino CI tests for Network - - run: bundle install - - run: g++ -v - name: Build and Execute run: | + g++ -v + bundle install cd SampleProjects/NetworkLib bash -x ./scripts/install.sh bundle install From c1320d8ba50f30046c77d8b5149f497ec02a85aa Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Sun, 15 Nov 2020 18:40:06 -0800 Subject: [PATCH 15/15] Update install.sh --- SampleProjects/NetworkLib/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleProjects/NetworkLib/scripts/install.sh b/SampleProjects/NetworkLib/scripts/install.sh index d99d592f..54b8d4e0 100755 --- a/SampleProjects/NetworkLib/scripts/install.sh +++ b/SampleProjects/NetworkLib/scripts/install.sh @@ -4,5 +4,5 @@ # then get the custom one we want to use for testing cd $(bundle exec arduino_library_location.rb) if [ ! -d ./Ethernet ] ; then - git clone -v --depth 1 https://github.com/Arduino-CI/Ethernet.git + git clone --depth 1 https://github.com/Arduino-CI/Ethernet.git fi