ci: make code-climate utils runnable via rake concourse:task

ashmaroli · Apr 22, 2019 · d53d240 · d53d240
1 parent 899c86f
commit d53d240
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/concourse/nokogiri-pr.yml b/concourse/nokogiri-pr.yml
@@ -65,7 +65,7 @@ jobs:
           params:
             NOKOGIRI_USE_SYSTEM_LIBRARIES: t
 % if ruby_version == Concourse.production_rubies.last
-            CC_TEST_REPORTER_ID: {{code_climate_reporter_id_nokogiri}}
+            CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri))
 % end
           run:
             path: ci/concourse/tasks/rake-test/run.sh

diff --git a/concourse/nokogiri-pr.yml.generated b/concourse/nokogiri-pr.yml.generated
@@ -300,7 +300,7 @@ jobs:
               path: nokogiri
           params:
             NOKOGIRI_USE_SYSTEM_LIBRARIES: t
-            CC_TEST_REPORTER_ID: {{code_climate_reporter_id_nokogiri}}
+            CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri))
           run:
             path: ci/concourse/tasks/rake-test/run.sh
         on_failure: { aggregate: [*notify_failure_to_irc, *notify_failure_to_pr] }

diff --git a/concourse/nokogiri.yml b/concourse/nokogiri.yml
@@ -40,7 +40,7 @@ jobs:
           params:
             NOKOGIRI_USE_SYSTEM_LIBRARIES: t
 % if ruby_version == Concourse.production_rubies.last
-            CC_TEST_REPORTER_ID: {{code_climate_reporter_id_nokogiri}}
+            CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri))
             GIT_BRANCH: master
 % end
           run:

diff --git a/concourse/nokogiri.yml.generated b/concourse/nokogiri.yml.generated
@@ -252,7 +252,7 @@ jobs:
             - name: nokogiri
           params:
             NOKOGIRI_USE_SYSTEM_LIBRARIES: t
-            CC_TEST_REPORTER_ID: {{code_climate_reporter_id_nokogiri}}
+            CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri))
             GIT_BRANCH: master
           run:
             path: ci/concourse/tasks/rake-test/run.sh

diff --git a/concourse/shared/code-climate.sh b/concourse/shared/code-climate.sh
@@ -30,8 +30,8 @@ function code-climate-setup {
 
     export CI_NAME="concourse"
 
-    ./${CC_CLI} env
-    ./${CC_CLI} before-build
+    ./${CC_CLI} env || true
+    ./${CC_CLI} before-build || true
   fi
 
   restore-option-xtrace
@@ -43,7 +43,6 @@ function code-climate-shipit {
   if [ -z "${CC_TEST_REPORTER_ID:-}" ] ; then
     echo "WARNING: code-climate-shipit: CC_TEST_REPORTER_ID is not set, skipping."
   else
-    # let's remove the `|| true` once all pull requests from pre-simplecov are cleared out
     ./${CC_CLI} after-build || true
   fi