From cf22b5c9f4cfeb0b08d89e9ad29eb55b669b34fb Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:39:10 -0800 Subject: [PATCH 01/12] Bump ruby version to 2.6.6 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index ecd7ee50..338a5b5d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.8 +2.6.6 From 7e5e2d9e3de00ab75fe8883b85d1f82622d23f26 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:41:16 -0800 Subject: [PATCH 02/12] Bump ruby matrix on travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d3ac828..d0f72711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ addons: language: ruby cache: bundler rvm: - - 2.5 - 2.6 + - 2.7 + - 3.0 branches: except: - /^depfu/.*$/ From ee2aec90c936712aa10747ac0ffcc9217bc87882 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:41:39 -0800 Subject: [PATCH 03/12] Switch travis OS to 20.04 / focal to match Heroku --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0f72711..08514c0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: xenial +dist: focal addons: apt: packages: From 2d1a59934002c00f4784bec684195abbdceb4a34 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:06:10 -0800 Subject: [PATCH 04/12] Specify ruby version in Gemfile in a way that works for Heroku + Travis --- Gemfile | 2 +- Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 77ac5a7e..5877787b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -# ruby '~> 2.5.0' +ruby ENV['TRAVIS_RUBY_VERSION'] || '2.6.6' # rails-assets requires >= 1.8.4 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') diff --git a/Gemfile.lock b/Gemfile.lock index 241cbb00..929552b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -784,5 +784,8 @@ DEPENDENCIES webmock whenever +RUBY VERSION + ruby 2.6.6p146 + BUNDLED WITH 1.17.3 From f10139efeb8b6aaf8793f6342602d303f008d8ac Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:11:32 -0800 Subject: [PATCH 05/12] Update badges and readme slightly --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2fe87dcf..ac0aa758 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ -[![Build Status](https://travis-ci.org/openSUSE/osem.svg?branch=master)](https://travis-ci.org/openSUSE/osem) -[![Code Climate](https://codeclimate.com/github/openSUSE/osem.png)](https://codeclimate.com/github/openSUSE/osem) -[![codecov](https://codecov.io/gh/opensuse/osem/branch/master/graph/badge.svg)](https://codecov.io/gh/opensuse/osem) -[![Security Status](https://hakiri.io/github/openSUSE/osem/master.svg)](https://hakiri.io/github/openSUSE/osem/master) -[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/openSUSE/osem) - +[![Build Status](https://travis-ci.org/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.org/snap-cloud/snapcon) +[![Code Climate](https://codeclimate.com/github/snap-cloud/snapcon.png)](https://codeclimate.com/github/snap-cloud/snapcon) +[![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) +[![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) +[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) + Deploy -# Open Source Event Manager - [osem.io](https://osem.io) + +# [Snap!Con](https://snapcon.org) +forked from: +## Open Source Event Manager - [osem.io](https://osem.io) ![OSEM Logo](doc/osem-logo.png) An event management tool tailored to Free and Open Source Software conferences. From 9d3043d8107360000d8312afdd20b8f0f7ac55ac Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:29:41 -0800 Subject: [PATCH 06/12] Rails 5.2 is only good on Ruby 2.6. Will not run other versions until upgrade --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08514c0e..60307caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,7 @@ addons: language: ruby cache: bundler rvm: - - 2.6 - - 2.7 - - 3.0 + - 2.6.6 branches: except: - /^depfu/.*$/ From 8238ff03be0e763187b51d7e73109731724359cc Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:47:51 -0800 Subject: [PATCH 07/12] CodeClimate Test Reporter from Travis --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 60307caa..2f095c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,16 +25,28 @@ notifications: on_success: change on_failure: change before_script: + # install CodeClimate test reporter and tell it we are starting a test run + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR + - chmod +x $CCTR + - $CCTR before-build - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" + - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json +after_script: + # combine coverage from all suites, and upload to CodeClimate + - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage + - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT + env: global: - OSEM_DB_ADAPTER=sqlite3 - OSEM_DB_HOST='' - OSEM_DB_PORT='' - OSEM_DB_NAME='osem_test' + - CC_TEST_REPORTER_ID=$CC_TEST_REPORTER + - CCTR=./cc-test-reporter matrix: - TEST_SUITE=ability - TEST_SUITE=features From 705cc469de35a8660c5fe78dd26c3b407d2458f4 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 23:03:19 -0800 Subject: [PATCH 08/12] Update badges in README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ac0aa758..489b10b9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -[![Build Status](https://travis-ci.org/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.org/snap-cloud/snapcon) -[![Code Climate](https://codeclimate.com/github/snap-cloud/snapcon.png)](https://codeclimate.com/github/snap-cloud/snapcon) +[![Build Status](https://travis-ci.com/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.com/snap-cloud/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/maintainability)](https://codeclimate.com/github/snap-cloud/snapcon/maintainability) +[![Test Coverage](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/test_coverage)](https://codeclimate.com/github/snap-cloud/snapcon/test_coverage) [![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) [![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) [![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) From 56042226a130d2bb133e5764ba35f4e2e919b32a Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 01:28:07 -0800 Subject: [PATCH 09/12] CodeClimate isnt quite configured right... --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f095c95..f33b6c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,8 @@ before_script: - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" - - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json + # TODO Get this working. + # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json after_script: # combine coverage from all suites, and upload to CodeClimate - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage From 6cb8fe3787e03555156f98c64fe13365fd20303c Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 01:51:55 -0800 Subject: [PATCH 10/12] Comment out all codeclimate references --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f33b6c3b..d725ca97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,19 +26,19 @@ notifications: on_failure: change before_script: # install CodeClimate test reporter and tell it we are starting a test run - - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR - - chmod +x $CCTR - - $CCTR before-build + # - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR + # - chmod +x $CCTR + # - $CCTR before-build - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" # TODO Get this working. # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json -after_script: - # combine coverage from all suites, and upload to CodeClimate - - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage - - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT +# after_script: + # combine coverage from all suites, and upload3 to CodeClimate + # - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage + # - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT env: global: From c6640c0de2ccbd467a0015420e480c47efd0a865 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 14:15:10 -0800 Subject: [PATCH 11/12] Update travis config. Try bionic build. --- .travis.yml | 5 ++--- travis_script.sh => bin/travis_script.sh | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename travis_script.sh => bin/travis_script.sh (100%) diff --git a/.travis.yml b/.travis.yml index d725ca97..fe35742e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -sudo: required -dist: focal +dist: bionic addons: apt: packages: @@ -32,7 +31,7 @@ before_script: - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - - "./travis_script.sh $TEST_SUITE" + - "bin/travis_script.sh $TEST_SUITE" # TODO Get this working. # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json # after_script: diff --git a/travis_script.sh b/bin/travis_script.sh similarity index 100% rename from travis_script.sh rename to bin/travis_script.sh From fa85205d27da0842021d4336a9e0a708b26dc09d Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 15:52:51 -0800 Subject: [PATCH 12/12] Cleanup travis a bit, add postgres, but its not used yet... --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe35742e..a94c68ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ +language: ruby +cache: bundler +rvm: + - 2.6.6 dist: bionic addons: apt: packages: - chromium-browser -language: ruby -cache: bundler -rvm: - - 2.6.6 +services: + - postgresql branches: except: - /^depfu/.*$/