From bd5df54592834eb961adf898dbaa28f69921cea9 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sun, 26 Jan 2020 00:04:40 -0500 Subject: [PATCH 1/7] Add SimpleCov even without an environment variable This is a test to generate the .resultset.json files --- spec/rails_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 447a08d681e08..2182a53e50e8c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -if ENV['COVERAGE'] - require 'simplecov' - SimpleCov.start -end +require 'simplecov' +SimpleCov.start require 'rubygems' require 'rbtrace' From 3bde250a0bb6746c50eb7554799d63cfe696310b Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Tue, 4 Feb 2020 13:35:41 -0500 Subject: [PATCH 2/7] Add artifacts configuration --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7119b6cd2e7aa..22ff1ff98fb32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +addons: + artifacts: true + language: ruby git: From ec7c3a9e6a2199e932e02cce73bf1669dbd30bf7 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Tue, 4 Feb 2020 14:16:14 -0500 Subject: [PATCH 3/7] Make sure that we run skunk on `app` --- .github/workflows/skunk.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/skunk.yml diff --git a/.github/workflows/skunk.yml b/.github/workflows/skunk.yml new file mode 100644 index 0000000000000..82afa3082d221 --- /dev/null +++ b/.github/workflows/skunk.yml @@ -0,0 +1,19 @@ +# .github/workflows/skunk.yml + +name: Skunk +on: [push, pull_request] + +jobs: + skunk: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + - name: Run Skunk on Project + run: | + gem install skunk + skunk app \ No newline at end of file From 0ee628158547aafac8d6b54a7a46eb9bef6b2a8b Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Wed, 5 Feb 2020 20:51:14 -0500 Subject: [PATCH 4/7] Debug artifacts upload --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22ff1ff98fb32..5873a07a9f995 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ addons: - artifacts: true + artifacts: + debug: true + target_paths: + - /$TRAVIS_OS_NAME/$((lsb_release -rs 2>/dev/null || sw_vers -productVersion) | grep --only -E '^[0-9]+\.[0-9]+') + language: ruby From 6d5389f0922edb7a27c5662cdf8e78eda1774b3d Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Wed, 5 Feb 2020 21:07:14 -0500 Subject: [PATCH 5/7] Correct configuration --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5873a07a9f995..2b8fe662726f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,3 @@ -addons: - artifacts: - debug: true - target_paths: - - /$TRAVIS_OS_NAME/$((lsb_release -rs 2>/dev/null || sw_vers -productVersion) | grep --only -E '^[0-9]+\.[0-9]+') - - language: ruby git: @@ -23,10 +16,12 @@ env: - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 matrix: - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=0" - - "RAILS_MASTER=0 QUNIT_RUN=1 RUN_LINT=0" - - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=1" addons: + artifacts: + debug: true + target_paths: + - /$TRAVIS_OS_NAME/$((lsb_release -rs 2>/dev/null || sw_vers -productVersion) | grep --only -E '^[0-9]+\.[0-9]+') chrome: stable postgresql: "9.6" apt: From 07dfd049e5aba894934f3ff8500e4c42ff32879f Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Wed, 5 Feb 2020 22:45:15 -0500 Subject: [PATCH 6/7] Update configuration --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b8fe662726f5..bcbfd5bc11c1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ branches: env: global: + - AWS_ACCESS_KEY_ID=${ARTIFACTS_KEY} + - AWS_SECRET_ACCESS_KEY=${ARTIFACTS_SECRET} - TRAVIS_NODE_VERSION="10" - DISCOURSE_HOSTNAME=www.example.com - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 @@ -19,9 +21,11 @@ env: addons: artifacts: + bucket: ombulabs-discourse-test + paths: + - ./coverage + target_paths: $TRAVIS_BUILD_NUMBER debug: true - target_paths: - - /$TRAVIS_OS_NAME/$((lsb_release -rs 2>/dev/null || sw_vers -productVersion) | grep --only -E '^[0-9]+\.[0-9]+') chrome: stable postgresql: "9.6" apt: From a39824ea1e0191d0841395f7c38d48136b55be90 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 8 Feb 2020 15:27:19 -0500 Subject: [PATCH 7/7] Add skunk steps after RSpec executes --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index bcbfd5bc11c1c..08c8db550023b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,5 +88,8 @@ script: else bundle exec rspec && bundle exec rake plugin:spec fi + gem install skunk + cat coverage/.resultset.json + skunk app fi "