From a418d31e89ddb9a3605bf88760a370edeff0bc9c Mon Sep 17 00:00:00 2001 From: Tom Duff Date: Sun, 6 May 2018 07:46:14 +0100 Subject: [PATCH 1/3] Remove lock files --- SampleProjects/DoSomething/Gemfile.lock | 19 ------------------- SampleProjects/TestSomething/Gemfile.lock | 19 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 SampleProjects/DoSomething/Gemfile.lock delete mode 100644 SampleProjects/TestSomething/Gemfile.lock diff --git a/SampleProjects/DoSomething/Gemfile.lock b/SampleProjects/DoSomething/Gemfile.lock deleted file mode 100644 index 01228d8d..00000000 --- a/SampleProjects/DoSomething/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -PATH - remote: /Users/ikatz/Development/non-wayfair/arduino_ci - specs: - arduino_ci (0.1.7) - os (~> 1.0) - -GEM - remote: https://rubygems.org/ - specs: - os (1.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - arduino_ci! - -BUNDLED WITH - 1.16.0 diff --git a/SampleProjects/TestSomething/Gemfile.lock b/SampleProjects/TestSomething/Gemfile.lock deleted file mode 100644 index e1c89622..00000000 --- a/SampleProjects/TestSomething/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -PATH - remote: /Users/ikatz/Development/non-wayfair/arduino_ci - specs: - arduino_ci (0.1.8) - os (~> 1.0) - -GEM - remote: https://rubygems.org/ - specs: - os (1.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - arduino_ci! - -BUNDLED WITH - 1.16.0 From 0300b27ccf2927377d968f8fca1755b2c1d2e6f2 Mon Sep 17 00:00:00 2001 From: Tom Duff Date: Sun, 6 May 2018 07:47:25 +0100 Subject: [PATCH 2/3] Udated .gitignore to ignore lock files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e35644c..b85d2d1e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ vendor # C++ stuff *.bin *.bin.dSYM +*.lock From 6eff6c38527262ed4493c44bcbe5c24329849b93 Mon Sep 17 00:00:00 2001 From: Tom Duff Date: Sun, 6 May 2018 08:14:39 +0100 Subject: [PATCH 3/3] Moved .lock ignroe out of the 'c++' section Just for readability --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b85d2d1e..ce8d5622 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /spec/reports/ vendor *.gem +*.lock # rspec failure tracking .rspec_status @@ -15,4 +16,3 @@ vendor # C++ stuff *.bin *.bin.dSYM -*.lock