diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile new file mode 100644 index 0000000000..2913f4f115 --- /dev/null +++ b/.gitpod.dockerfile @@ -0,0 +1 @@ +FROM gitpod/workspace-mysql \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..8d647d296c --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,27 @@ +image: + file: .gitpod.dockerfile +ports: + - port: 3000 + onOpen: open-preview +tasks: + - init: > + bundle install --without production && + cp config/database.yml.gitpod config/database.yml && + mysql -e "SET @@global.sql_mode=(SELECT REPLACE(@@global.sql_mode, 'ONLY_FULL_GROUP_BY', ''));" && + mysql -e "CREATE DATABASE plots;" && + cp db/schema.rb.example db/schema.rb && + rake db:setup && + yarn install + + command: > + passenger start + +github: + prebuilds: + branches: true + pullRequests: true + pullRequestsFromForks: true + addCheck: true + addComment: true + addBadge: false + addLabel: false diff --git a/.travis.yml b/.travis.yml index 01bcd714a4..32bb88386e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: ruby rvm: - - 2.4.4 + - 2.6.6 services: - docker diff --git a/Gemfile b/Gemfile index 1b252ffaab..3f1fc374e2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.4.4' +ruby '2.6.6' git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") diff --git a/Gemfile.lock b/Gemfile.lock index afd5aab52d..712c0519e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -688,7 +688,7 @@ DEPENDENCIES will_paginate-bootstrap4 RUBY VERSION - ruby 2.4.4p296 + ruby 2.6.6p146 BUNDLED WITH 2.1.4 diff --git a/config/database.yml.gitpod b/config/database.yml.gitpod new file mode 100644 index 0000000000..8631521539 --- /dev/null +++ b/config/database.yml.gitpod @@ -0,0 +1,18 @@ +development: + adapter: mysql2 + username: root + password: + encoding: utf8 + database: plots + strict: false + +production: + adapter: sqlite3 + database: production.sqlite + +# Warning: The contents of the database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: sqlite3 + database: test.sqlite