From 5ae379e49c8014489257fb8e2d563114405c9b92 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Wed, 14 Jun 2017 22:06:28 +0900 Subject: [PATCH 01/28] Workflows Demo: Fan-in / Fan-out --- Gemfile | 54 +++++ Gemfile.lock | 191 ++++++++++++++++++ README.md | 10 +- Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 ++ app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/welcome.coffee | 3 + app/assets/stylesheets/application.css | 15 ++ app/assets/stylesheets/welcome.scss | 3 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/controllers/welcome_controller.rb | 2 + app/helpers/application_helper.rb | 2 + app/helpers/welcome_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + app/views/welcome/index.html.erb | 4 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 38 ++++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 18 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 ++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 +++++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 6 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 4 + config/secrets.yml | 32 +++ config/spring.rb | 6 + db/schema.rb | 18 ++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 log/development.log | 17 ++ package.json | 5 + public/404.html | 67 ++++++ public/422.html | 67 ++++++ public/500.html | 66 ++++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/controllers/welcome_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 9 + tmp/.keep | 0 tmp/restart.txt | 0 vendor/.keep | 0 84 files changed, 1265 insertions(+), 5 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/javascripts/welcome.coffee create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/welcome.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/welcome_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/welcome_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100644 app/views/welcome/index.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/schema.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 log/development.log create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/welcome_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/restart.txt create mode 100644 vendor/.keep diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..adc050e --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.1' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..c1ff4a6 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,191 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.1) + actionpack (= 5.1.1) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.1) + actionview (= 5.1.1) + activesupport (= 5.1.1) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.1) + activesupport (= 5.1.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.1) + activesupport (= 5.1.1) + globalid (>= 0.3.6) + activemodel (5.1.1) + activesupport (= 5.1.1) + activerecord (5.1.1) + activemodel (= 5.1.1) + activesupport (= 5.1.1) + arel (~> 8.0) + activesupport (5.1.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) + arel (8.0.0) + bindex (0.5.0) + builder (3.2.3) + byebug (9.0.6) + capybara (2.14.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.7.0) + ffi (~> 1.0, >= 1.0.11) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + erubi (1.6.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.4) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.6) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.2.0) + minitest (5.10.2) + multi_json (1.12.1) + nio4r (2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + pg (0.21.0) + public_suffix (2.0.5) + puma (3.9.1) + rack (2.0.3) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.1.1) + actioncable (= 5.1.1) + actionmailer (= 5.1.1) + actionpack (= 5.1.1) + actionview (= 5.1.1) + activejob (= 5.1.1) + activemodel (= 5.1.1) + activerecord (= 5.1.1) + activesupport (= 5.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 5.1.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.1) + actionpack (= 5.1.1) + activesupport (= 5.1.1) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.4.24) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.4.1) + childprocess (~> 0.5) + rubyzip (~> 1.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + capybara (~> 2.13) + coffee-rails (~> 4.2) + jbuilder (~> 2.5) + listen (>= 3.0.5, < 3.2) + pg (~> 0.18) + puma (~> 3.7) + rails (~> 5.1.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.15.1 diff --git a/README.md b/README.md index fc4c7f3..1c18fc5 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# CircleCI Demos: Workflows +# CircleCI Workflows Demos: Fan-in / Fan-out + +... + +## Other Workflows Demos * [Parallel Jobs](https://github.com/CircleCI-Public/circleci-demo-workflows/tree/parallel-jobs) * [Sequential Job / Branch-Level](https://github.com/CircleCI-Public/circleci-demo-workflows/tree/sequential-branch-filter) * [Fan-in / Fan-out](https://github.com/CircleCI-Public/circleci-demo-workflows/tree/fan-in-fan-out) - -## TODO - * [Workspace Forwarding](https://github.com/CircleCI-Public/circleci-demo-workflows/tree/workspace-forwarding) - diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..e85f913 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000..46b2035 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000..739aa5f --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/welcome.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000..d05ea0f --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss new file mode 100644 index 0000000..77ce11a --- /dev/null +++ b/app/assets/stylesheets/welcome.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the welcome controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000..d672697 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000..0ff5442 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000..1c07694 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb new file mode 100644 index 0000000..d8c85ab --- /dev/null +++ b/app/controllers/welcome_controller.rb @@ -0,0 +1,2 @@ +class WelcomeController < ApplicationController +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb new file mode 100644 index 0000000..eeead45 --- /dev/null +++ b/app/helpers/welcome_helper.rb @@ -0,0 +1,2 @@ +module WelcomeHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000..a009ace --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000..286b223 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000..10a4cba --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000..ff2bf71 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + WorkflowsBranchFilter + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000..cbd34d2 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000..37f0bdd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 0000000..a3f36b6 --- /dev/null +++ b/app/views/welcome/index.html.erb @@ -0,0 +1,4 @@ +

Hello, CircleCI!

+

+ The time is now: <%= Time.now %> +

diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000..66e9889 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000..5badb2f --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000..d87d5f5 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000..78c4e86 --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000..fb2ec2e --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000..a8e4462 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000..c2bacef --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000..f7ba0b5 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000..e771c8b --- /dev/null +++ b/config/application.rb @@ -0,0 +1,18 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module WorkflowsBranchFilter + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000..30f5120 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000..77a0be7 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: workflows_branch_filter_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000..b1b10c0 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + host: localhost + user: postgres + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: rails_blog + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: zomg + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: 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: + <<: *default + database: rails_blog + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + url: <%= ENV['DATABASE_URL'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000..426333b --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000..5187e22 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000..8c4b0bd --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "workflows_branch_filter_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000..8e5cbde --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000..51639b6 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..4b828e8 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000..59385cd --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000..5a6a32d --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000..4a994e1 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000..ac033bf --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000..dc18996 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000..bbfc396 --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000..decc5a8 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000..1e19380 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000..905ecb3 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,4 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'welcome#index' +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000..823969b --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: b75d77c1585bcccc5c00984e8c28602fb460c4f78252c83529716ff9e8873dcb9fcffc7b03e0957d08e99a1514ace5c82127e681053479f2640308928b034aa6 + +test: + secret_key_base: 768cf1336f8ddd8bb918d23a5e2969dd0d212a84af107460925f686b49c54c16a73827e1005006aed204adff0c3b4c658c99bb7f8c1d23c472006ef890977c98 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000..c9119b4 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..2611543 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000..1beea2a --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000..e69de29 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000..e69de29 diff --git a/log/development.log b/log/development.log new file mode 100644 index 0000000..40155e8 --- /dev/null +++ b/log/development.log @@ -0,0 +1,17 @@ +Started GET "/" for 127.0.0.1 at 2017-06-14 15:12:00 +0900 +Processing by WelcomeController#index as HTML + Rendering welcome/index.html.erb within layouts/application + Rendered welcome/index.html.erb within layouts/application (0.8ms) +Completed 200 OK in 683ms (Views: 544.9ms) + + +  (9.1ms) CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY) +  (7.0ms) CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) +  (0.3ms) SELECT pg_try_advisory_lock(524389157724174435); +  (0.8ms) SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC + ActiveRecord::InternalMetadata Load (0.5ms) SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2 [["key", "environment"], ["LIMIT", 1]] +  (0.3ms) BEGIN + SQL (0.5ms) INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key" [["key", "environment"], ["value", "development"], ["created_at", "2017-06-14 06:25:14.387495"], ["updated_at", "2017-06-14 06:25:14.387495"]] +  (1.2ms) COMMIT +  (0.4ms) SELECT pg_advisory_unlock(524389157724174435) +  (0.4ms) SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC diff --git a/package.json b/package.json new file mode 100644 index 0000000..27feb0a --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "workflows_branch_filter", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000..2be3af2 --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 0000000..c08eac0 --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 0000000..78a030a --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..e69de29 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..e69de29 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000..37b576a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000..d19212a --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/controllers/welcome_controller_test.rb b/test/controllers/welcome_controller_test.rb new file mode 100644 index 0000000..59d2d0a --- /dev/null +++ b/test/controllers/welcome_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WelcomeControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000..e3c4ff0 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,9 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000..e69de29 diff --git a/tmp/restart.txt b/tmp/restart.txt new file mode 100644 index 0000000..e69de29 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000..e69de29 From 7c8a408d451b41f0581cdbc7d132f55408c9e1c8 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Wed, 14 Jun 2017 22:33:37 +0900 Subject: [PATCH 02/28] Workflows Demos: Fan-in/Fan-out --- .circleci/config.yml | 155 ++++++++++++++++++++++++++++++++++++++ .circleci/setup-heroku.sh | 14 ++++ 2 files changed, 169 insertions(+) create mode 100644 .circleci/config.yml create mode 100644 .circleci/setup-heroku.sh diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..fc6110b --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,155 @@ +version: 2.0 + +jobs: + checkout_code: + docker: + - image: circleci/ruby:2.4-node + - image: circleci/postgres:9.4.12-alpine + working_directory: ~/workflows_branch_filter + steps: + - checkout + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - save_cache: + key: v1-repo-{{ checksum ".circle-sha" }} + paths: + - ~/workflows_branch_filter + + bundle_dependencies: + docker: + - image: circleci/ruby:2.4-node + - image: circleci/postgres:9.4.12-alpine + working_directory: ~/workflows_branch_filter + steps: + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - restore_cache: + keys: + - v1-repo-{{ checksum ".circle-sha" }} + - restore_cache: + keys: + - v1-bundle-{{ checksum "Gemfile.lock" }} + - run: bundle install --path vendor/bundle + - save_cache: + key: v1-bundle-{{ checksum "Gemfile.lock" }} + paths: + - ~/workflows_branch_filter/vendor/bundle + + setup_database: + docker: + - image: circleci/ruby:2.4-node + - image: circleci/postgres:9.4.12-alpine + working_directory: ~/workflows_branch_filter + steps: + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - restore_cache: + keys: + - v1-repo-{{ checksum ".circle-sha" }} + - restore_cache: + keys: + - v1-bundle-{{ checksum "Gemfile.lock" }} + - run: bundle --path vendor/bundle + - run: bundle exec rake db:create db:schema:load + + rake_test: + docker: + - image: circleci/ruby:2.4-node + - image: circleci/postgres:9.4.12-alpine + working_directory: ~/workflows_branch_filter + steps: + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - restore_cache: + keys: + - v1-repo-{{ checksum ".circle-sha" }} + - restore_cache: + keys: + - v1-bundle-{{ checksum "Gemfile.lock" }} + - run: bundle --path vendor/bundle + - run: + name: Run tests + command: bundle exec rake + + precompile_assets: + docker: + - image: circleci/ruby:2.4-node + - image: circleci/postgres:9.4.12-alpine + working_directory: ~/workflows_branch_filter + steps: + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - restore_cache: + keys: + - v1-repo-{{ checksum ".circle-sha" }} + - restore_cache: + keys: + - v1-bundle-{{ checksum "Gemfile.lock" }} + - run: bundle --path vendor/bundle + - run: + name: Precompile assets + command: bundle exec rake assets:precompile + - save_cache: + key: v1-assets-{{ checksum ".circle-sha" }} + paths: + - ~/workflows_branch_filter/public/assets + + deploy: + machine: + enabled: true + working_directory: ~/workflows_branch_filter + steps: + - run: + name: save SHA to a file + command: echo $CIRCLE_SHA1 > .circle-sha + - restore_cache: + keys: + - v1-repo-{{ checksum ".circle-sha" }} + - restore_cache: + keys: + - v1-bundle-{{ checksum "Gemfile.lock" }} + - restore_cache: + keys: + - v1-assets-{{ checksum ".circle-sha" }} + - run: + name: Setup Heroku + command: bash .circleci/setup-heroku.sh + - run: + command: | + git push heroku master + heroku run rake db:migrate + sleep 5 # sleep for 5 seconds to wait for dynos + heroku restart + +workflows: + version: 2 + build-and-deploy: + jobs: + - checkout_code + - bundle_dependencies: + requires: + - checkout_code + - setup_database: + requires: + - checkout_code + - bundle_dependencies + - rake_test: + requires: + - checkout_code + - bundle_dependencies + - setup_database + - precompile_assets: + requires: + - checkout_code + - bundle_dependencies + - setup_database + - deploy: + requires: + - checkout_code + - rake_test + - precompile_assets diff --git a/.circleci/setup-heroku.sh b/.circleci/setup-heroku.sh new file mode 100644 index 0000000..dde0601 --- /dev/null +++ b/.circleci/setup-heroku.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +wget -qO- https://cli-assets.heroku.com/install-ubuntu.sh | sh + +cat > ~/.netrc << EOF +machine api.heroku.com + login $HEROKU_LOGIN + password $HEROKU_API_KEY +machine git.heroku.com + login $HEROKU_LOGIN + password $HEROKU_API_KEY +EOF + +heroku git:remote -a $HEROKU_APP From 9cc67655f1cc1413294ee84b5d30b1c81cbb6f32 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Wed, 14 Jun 2017 22:40:40 +0900 Subject: [PATCH 03/28] Whoops --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc6110b..135fef9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - checkout - run: @@ -14,13 +14,13 @@ jobs: - save_cache: key: v1-repo-{{ checksum ".circle-sha" }} paths: - - ~/workflows_branch_filter + - ~/circleci-demo-workflows bundle_dependencies: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - run: name: save SHA to a file @@ -35,13 +35,13 @@ jobs: - save_cache: key: v1-bundle-{{ checksum "Gemfile.lock" }} paths: - - ~/workflows_branch_filter/vendor/bundle + - ~/circleci-demo-workflows/vendor/bundle setup_database: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - run: name: save SHA to a file @@ -59,7 +59,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - run: name: save SHA to a file @@ -79,7 +79,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - run: name: save SHA to a file @@ -97,12 +97,12 @@ jobs: - save_cache: key: v1-assets-{{ checksum ".circle-sha" }} paths: - - ~/workflows_branch_filter/public/assets + - ~/circleci-demo-workflows/public/assets deploy: machine: enabled: true - working_directory: ~/workflows_branch_filter + working_directory: ~/circleci-demo-workflows steps: - run: name: save SHA to a file From a57fe1592fdb4cf429886779642f1e8080aee472 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Wed, 14 Jun 2017 22:42:52 +0900 Subject: [PATCH 04/28] Squash setup_database into rake_test Since we can't persist the database container after the schema is loaded to other jobs --- .circleci/config.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 135fef9..2ed33f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,24 +37,6 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - setup_database: - docker: - - image: circleci/ruby:2.4-node - - image: circleci/postgres:9.4.12-alpine - working_directory: ~/circleci-demo-workflows - steps: - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - restore_cache: - keys: - - v1-repo-{{ checksum ".circle-sha" }} - - restore_cache: - keys: - - v1-bundle-{{ checksum "Gemfile.lock" }} - - run: bundle --path vendor/bundle - - run: bundle exec rake db:create db:schema:load - rake_test: docker: - image: circleci/ruby:2.4-node @@ -71,6 +53,7 @@ jobs: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} - run: bundle --path vendor/bundle + - run: bundle exec rake db:create db:schema:load - run: name: Run tests command: bundle exec rake @@ -134,20 +117,14 @@ workflows: - bundle_dependencies: requires: - checkout_code - - setup_database: - requires: - - checkout_code - - bundle_dependencies - rake_test: requires: - checkout_code - bundle_dependencies - - setup_database - precompile_assets: requires: - checkout_code - bundle_dependencies - - setup_database - deploy: requires: - checkout_code From 9c6633076604e23623ea14137dbe34c3b0b674cb Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Thu, 15 Jun 2017 15:20:34 +0900 Subject: [PATCH 05/28] Deploy to separate app on this branch Closes #1 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ed33f9..1f57b00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,6 +86,8 @@ jobs: machine: enabled: true working_directory: ~/circleci-demo-workflows + environment: + - HEROKU_APP: still-shelf-38337 steps: - run: name: save SHA to a file From 03df762a7625c0a926b40cef2d01dd7794cdb578 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 26 Jun 2017 12:16:46 +0900 Subject: [PATCH 06/28] Push this branch as master --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f57b00..9a8e37c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,7 +106,7 @@ jobs: command: bash .circleci/setup-heroku.sh - run: command: | - git push heroku master + git push heroku fan-in-fan-out:master heroku run rake db:migrate sleep 5 # sleep for 5 seconds to wait for dynos heroku restart From dbb8e4a792893ea1519f6cbfc6c809b5aa3df0ad Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 26 Jun 2017 12:32:09 +0900 Subject: [PATCH 07/28] Workspace Forwarding --- .circleci/config.yml | 65 ++++++++++++++------------------------------ README.md | 2 +- 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a8e37c..1357bb1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,11 +8,7 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - checkout - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - save_cache: - key: v1-repo-{{ checksum ".circle-sha" }} + - persist_to_workspace: paths: - ~/circleci-demo-workflows @@ -22,12 +18,8 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - restore_cache: - keys: - - v1-repo-{{ checksum ".circle-sha" }} + - attach_workspace: + at: ~/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} @@ -36,6 +28,8 @@ jobs: key: v1-bundle-{{ checksum "Gemfile.lock" }} paths: - ~/circleci-demo-workflows/vendor/bundle + - persist_to_workspace: + paths: ~/circleci-demo-workflows/vendor/bundle rake_test: docker: @@ -43,15 +37,10 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - restore_cache: - keys: - - v1-repo-{{ checksum ".circle-sha" }} - - restore_cache: - keys: - - v1-bundle-{{ checksum "Gemfile.lock" }} + - attach_workspace: + at: ~/circleci-demo-workflows + - attach_workspace: + at: ~/circleci-demo-workflows/vendor/bundle - run: bundle --path vendor/bundle - run: bundle exec rake db:create db:schema:load - run: @@ -64,21 +53,15 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - restore_cache: - keys: - - v1-repo-{{ checksum ".circle-sha" }} - - restore_cache: - keys: - - v1-bundle-{{ checksum "Gemfile.lock" }} + - attach_workspace: + at: ~/circleci-demo-workflows + - attach_workspace: + at: ~/circleci-demo-workflows/vendor/bundle - run: bundle --path vendor/bundle - run: name: Precompile assets command: bundle exec rake assets:precompile - - save_cache: - key: v1-assets-{{ checksum ".circle-sha" }} + - persist_to_workspace: paths: - ~/circleci-demo-workflows/public/assets @@ -89,24 +72,18 @@ jobs: environment: - HEROKU_APP: still-shelf-38337 steps: - - run: - name: save SHA to a file - command: echo $CIRCLE_SHA1 > .circle-sha - - restore_cache: - keys: - - v1-repo-{{ checksum ".circle-sha" }} - - restore_cache: - keys: - - v1-bundle-{{ checksum "Gemfile.lock" }} - - restore_cache: - keys: - - v1-assets-{{ checksum ".circle-sha" }} + - attach_workspace: + at: ~/circleci-demo-workflows + - attach_workspace: + at: ~/circleci-demo-workflows/vendor/bundle + - attach_workspace: + at: ~/circleci-demo-workflows/public/assets - run: name: Setup Heroku command: bash .circleci/setup-heroku.sh - run: command: | - git push heroku fan-in-fan-out:master + git push heroku workspace-forwarding:master heroku run rake db:migrate sleep 5 # sleep for 5 seconds to wait for dynos heroku restart diff --git a/README.md b/README.md index 1c18fc5..260050b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CircleCI Workflows Demos: Fan-in / Fan-out +# CircleCI Workflows Demos: Workspace Forwarding ... From cff734e3c0aa1a215f9b32f9ecfdfab45d191acb Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 26 Jun 2017 12:41:49 +0900 Subject: [PATCH 08/28] Workspace root was not given --- .circleci/config.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1357bb1..a6363d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,9 @@ jobs: steps: - checkout - persist_to_workspace: + root: ~/ paths: - - ~/circleci-demo-workflows + - circleci-demo-workflows bundle_dependencies: docker: @@ -29,7 +30,9 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - persist_to_workspace: - paths: ~/circleci-demo-workflows/vendor/bundle + root: ~/circleci-demo-workflows + paths: + - vendor/bundle rake_test: docker: @@ -62,8 +65,9 @@ jobs: name: Precompile assets command: bundle exec rake assets:precompile - persist_to_workspace: + root: ~/circleci-demo-workflows paths: - - ~/circleci-demo-workflows/public/assets + - public/assets deploy: machine: From 00e480aca1ba0c73c28ac19223f26caf7bf9bbe4 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 26 Jun 2017 13:05:20 +0900 Subject: [PATCH 09/28] Error locating workspace root directory --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6363d9..59edcac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,9 +9,9 @@ jobs: steps: - checkout - persist_to_workspace: - root: ~/ + root: . paths: - - circleci-demo-workflows + - . bundle_dependencies: docker: @@ -30,7 +30,7 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - persist_to_workspace: - root: ~/circleci-demo-workflows + root: . paths: - vendor/bundle @@ -65,7 +65,7 @@ jobs: name: Precompile assets command: bundle exec rake assets:precompile - persist_to_workspace: - root: ~/circleci-demo-workflows + root: . paths: - public/assets From 847d78d052e98d8dede459fa884bd9219fa4b5dc Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 26 Jun 2017 13:08:41 +0900 Subject: [PATCH 10/28] Debugging checkout and persist_to_workspace --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59edcac..659b689 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,11 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - checkout + - run: | + echo $PWD + ls -aslh . + ls -aslh ~ + ls -aslh ~/circleci-demo-workflows - persist_to_workspace: root: . paths: From b6e2da4f2daab378f342fbf7defee75a70243a0f Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:17:56 +0900 Subject: [PATCH 11/28] zomg --- .circleci/config.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 659b689..437e04c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,15 +8,11 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - checkout - - run: | - echo $PWD - ls -aslh . - ls -aslh ~ - ls -aslh ~/circleci-demo-workflows + - run: ls -aslh ~/circleci-demo-workflows - persist_to_workspace: - root: . + root: /home paths: - - . + - circleci-demo-workflows bundle_dependencies: docker: From 129a5a4b8e4f8729486b4ef7f02f8efacb6e4064 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:24:33 +0900 Subject: [PATCH 12/28] attach --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 437e04c..9f5970d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - attach_workspace: - at: ~/circleci-demo-workflows + at: . - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} From 6f1c5bf109848d91fc924f71ead984051ef61b12 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:31:55 +0900 Subject: [PATCH 13/28] Use full path to attach --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f5970d..2f31ec9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - attach_workspace: - at: . + at: /home/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} From 6aec7ca2fafe9cb9548be0418aa65d392c7143e1 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:34:10 +0900 Subject: [PATCH 14/28] debug --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f31ec9..ad00945 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,8 +20,9 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: + - run: ls -aslh . - attach_workspace: - at: /home/circleci-demo-workflows + at: . - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} From f9a843339974112d534205b23ad146ccdb48326c Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:35:14 +0900 Subject: [PATCH 15/28] debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad00945..9c4c210 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: ls -aslh . + - run: ls -aslh /home - attach_workspace: at: . - restore_cache: From 555247907ec88b278b19455eea2319bf0e1d6ae1 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:36:42 +0900 Subject: [PATCH 16/28] debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c4c210..a993b0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: ls -aslh /home + - run: ls -aslh /home/circleci - attach_workspace: at: . - restore_cache: From 6838979846e676d978bc0af41dc108304d28b4fb Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:48:23 +0900 Subject: [PATCH 17/28] debug --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a993b0e..308d856 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,7 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - run: ls -aslh /home/circleci + - run: ls -aslh /home/circleci/circleci-demo-workflows - attach_workspace: at: . - restore_cache: From 6e114dc27565a6146734d47c3d6a7070131aca6d Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:49:34 +0900 Subject: [PATCH 18/28] Use full path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 308d856..1ea292c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: - run: ls -aslh /home/circleci - run: ls -aslh /home/circleci/circleci-demo-workflows - attach_workspace: - at: . + at: /home/circleci/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} From 1926341cba80f6f7afe487fb47541d7923d719c9 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:51:07 +0900 Subject: [PATCH 19/28] debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ea292c..4522db2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,10 +20,10 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: ~/circleci-demo-workflows steps: - - run: ls -aslh /home/circleci - run: ls -aslh /home/circleci/circleci-demo-workflows - attach_workspace: at: /home/circleci/circleci-demo-workflows + - run: ls -aslh /home/circleci/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} From ef06c85fe84b716f79837ed66f910bdcd64c0721 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sat, 8 Jul 2017 12:53:49 +0900 Subject: [PATCH 20/28] paths --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4522db2..d0bf24e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,9 +8,8 @@ jobs: working_directory: ~/circleci-demo-workflows steps: - checkout - - run: ls -aslh ~/circleci-demo-workflows - persist_to_workspace: - root: /home + root: /home/circleci paths: - circleci-demo-workflows From 7bce49091c105cbf66817c2432a8dacafbc033b3 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 08:49:30 +0900 Subject: [PATCH 21/28] Simplify paths --- .circleci/config.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0bf24e..9368ce0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,9 +9,7 @@ jobs: steps: - checkout - persist_to_workspace: - root: /home/circleci - paths: - - circleci-demo-workflows + paths: /home/circleci/circleci-demo-workflows bundle_dependencies: docker: @@ -32,9 +30,7 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - persist_to_workspace: - root: . - paths: - - vendor/bundle + paths: /home/circleci/circleci-demo-workflows/vendor/bundle rake_test: docker: @@ -67,9 +63,7 @@ jobs: name: Precompile assets command: bundle exec rake assets:precompile - persist_to_workspace: - root: . - paths: - - public/assets + paths: /home/circleci/circleci-demo-workflows/public/assets deploy: machine: From 0031f60fde9c55dd08833b0f789721a3e8d39fe8 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 08:58:49 +0900 Subject: [PATCH 22/28] paths must be relative to working dir --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9368ce0..89fc9a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: steps: - checkout - persist_to_workspace: - paths: /home/circleci/circleci-demo-workflows + paths: . bundle_dependencies: docker: @@ -30,7 +30,7 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - persist_to_workspace: - paths: /home/circleci/circleci-demo-workflows/vendor/bundle + paths: vendor/bundle rake_test: docker: @@ -63,7 +63,7 @@ jobs: name: Precompile assets command: bundle exec rake assets:precompile - persist_to_workspace: - paths: /home/circleci/circleci-demo-workflows/public/assets + paths: public/assets deploy: machine: From 8e72b16e01a4349b999ad245088550e2de71c373 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 09:01:33 +0900 Subject: [PATCH 23/28] Workspace root was not given --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89fc9a3..04db766 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,7 @@ jobs: steps: - checkout - persist_to_workspace: + root: . paths: . bundle_dependencies: @@ -30,6 +31,7 @@ jobs: paths: - ~/circleci-demo-workflows/vendor/bundle - persist_to_workspace: + root: . paths: vendor/bundle rake_test: @@ -63,6 +65,7 @@ jobs: name: Precompile assets command: bundle exec rake assets:precompile - persist_to_workspace: + root: . paths: public/assets deploy: From ed98ba9e123cb20d42161aaa4131e12b807efe81 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 09:02:59 +0900 Subject: [PATCH 24/28] expand working_directory --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04db766..a03e503 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/circleci-demo-workflows + working_directory: /home/circleci/circleci-demo-workflows steps: - checkout - persist_to_workspace: @@ -16,7 +16,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/circleci-demo-workflows + working_directory: /home/circleci/circleci-demo-workflows steps: - run: ls -aslh /home/circleci/circleci-demo-workflows - attach_workspace: @@ -38,7 +38,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/circleci-demo-workflows + working_directory: /home/circleci/circleci-demo-workflows steps: - attach_workspace: at: ~/circleci-demo-workflows @@ -54,7 +54,7 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: ~/circleci-demo-workflows + working_directory: /home/circleci/circleci-demo-workflows steps: - attach_workspace: at: ~/circleci-demo-workflows @@ -71,7 +71,7 @@ jobs: deploy: machine: enabled: true - working_directory: ~/circleci-demo-workflows + working_directory: /home/circleci/circleci-demo-workflows environment: - HEROKU_APP: still-shelf-38337 steps: From 06c3ec5cea0ea20680e10e7079b0361fcbb4e342 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 09:08:29 +0900 Subject: [PATCH 25/28] Fix attach_workspace "at" path --- .circleci/config.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a03e503..da36db2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,10 +18,8 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: /home/circleci/circleci-demo-workflows steps: - - run: ls -aslh /home/circleci/circleci-demo-workflows - attach_workspace: at: /home/circleci/circleci-demo-workflows - - run: ls -aslh /home/circleci/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} @@ -41,9 +39,9 @@ jobs: working_directory: /home/circleci/circleci-demo-workflows steps: - attach_workspace: - at: ~/circleci-demo-workflows + at: /home/circleci/circleci-demo-workflows - attach_workspace: - at: ~/circleci-demo-workflows/vendor/bundle + at: vendor/bundle - run: bundle --path vendor/bundle - run: bundle exec rake db:create db:schema:load - run: @@ -57,9 +55,9 @@ jobs: working_directory: /home/circleci/circleci-demo-workflows steps: - attach_workspace: - at: ~/circleci-demo-workflows + at: /home/circleci/circleci-demo-workflows - attach_workspace: - at: ~/circleci-demo-workflows/vendor/bundle + at: vendor/bundle - run: bundle --path vendor/bundle - run: name: Precompile assets @@ -76,11 +74,11 @@ jobs: - HEROKU_APP: still-shelf-38337 steps: - attach_workspace: - at: ~/circleci-demo-workflows + at: /home/circleci/circleci-demo-workflows - attach_workspace: - at: ~/circleci-demo-workflows/vendor/bundle + at: vendor/bundle - attach_workspace: - at: ~/circleci-demo-workflows/public/assets + at: public/assets - run: name: Setup Heroku command: bash .circleci/setup-heroku.sh From 2651f8599028d64ede7771428318397d1e45aa49 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 9 Jul 2017 09:14:14 +0900 Subject: [PATCH 26/28] Use unique heroku app for this branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da36db2..9059f85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,7 @@ jobs: enabled: true working_directory: /home/circleci/circleci-demo-workflows environment: - - HEROKU_APP: still-shelf-38337 + - HEROKU_APP: safe-wildwood-45845 steps: - attach_workspace: at: /home/circleci/circleci-demo-workflows From 27a807dd8cb28228efcbc5dd1d9d70a97aff5633 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 17 Jul 2017 18:19:52 +0900 Subject: [PATCH 27/28] Apply changes from @gordonsyme --- .circleci/config.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9059f85..194ea5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,23 +1,13 @@ version: 2.0 jobs: - checkout_code: - docker: - - image: circleci/ruby:2.4-node - - image: circleci/postgres:9.4.12-alpine - working_directory: /home/circleci/circleci-demo-workflows - steps: - - checkout - - persist_to_workspace: - root: . - paths: . - bundle_dependencies: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine working_directory: /home/circleci/circleci-demo-workflows steps: + - checkout - attach_workspace: at: /home/circleci/circleci-demo-workflows - restore_cache: @@ -38,10 +28,9 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: /home/circleci/circleci-demo-workflows steps: + - checkout - attach_workspace: at: /home/circleci/circleci-demo-workflows - - attach_workspace: - at: vendor/bundle - run: bundle --path vendor/bundle - run: bundle exec rake db:create db:schema:load - run: @@ -54,10 +43,9 @@ jobs: - image: circleci/postgres:9.4.12-alpine working_directory: /home/circleci/circleci-demo-workflows steps: + - checkout - attach_workspace: at: /home/circleci/circleci-demo-workflows - - attach_workspace: - at: vendor/bundle - run: bundle --path vendor/bundle - run: name: Precompile assets @@ -73,12 +61,9 @@ jobs: environment: - HEROKU_APP: safe-wildwood-45845 steps: + - checkout - attach_workspace: at: /home/circleci/circleci-demo-workflows - - attach_workspace: - at: vendor/bundle - - attach_workspace: - at: public/assets - run: name: Setup Heroku command: bash .circleci/setup-heroku.sh @@ -93,20 +78,14 @@ workflows: version: 2 build-and-deploy: jobs: - - checkout_code - - bundle_dependencies: - requires: - - checkout_code + - bundle_dependencies - rake_test: requires: - - checkout_code - bundle_dependencies - precompile_assets: requires: - - checkout_code - bundle_dependencies - deploy: requires: - - checkout_code - rake_test - precompile_assets From fd3fbf362e2213d8128faaac56293d51865ae60a Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Mon, 17 Jul 2017 18:20:43 +0900 Subject: [PATCH 28/28] We can use ~ now --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 194ea5a..eb366be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,11 +5,11 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: /home/circleci/circleci-demo-workflows + working_directory: ~/circleci-demo-workflows steps: - checkout - attach_workspace: - at: /home/circleci/circleci-demo-workflows + at: ~/circleci-demo-workflows - restore_cache: keys: - v1-bundle-{{ checksum "Gemfile.lock" }} @@ -26,11 +26,11 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: /home/circleci/circleci-demo-workflows + working_directory: ~/circleci-demo-workflows steps: - checkout - attach_workspace: - at: /home/circleci/circleci-demo-workflows + at: ~/circleci-demo-workflows - run: bundle --path vendor/bundle - run: bundle exec rake db:create db:schema:load - run: @@ -41,11 +41,11 @@ jobs: docker: - image: circleci/ruby:2.4-node - image: circleci/postgres:9.4.12-alpine - working_directory: /home/circleci/circleci-demo-workflows + working_directory: ~/circleci-demo-workflows steps: - checkout - attach_workspace: - at: /home/circleci/circleci-demo-workflows + at: ~/circleci-demo-workflows - run: bundle --path vendor/bundle - run: name: Precompile assets @@ -57,13 +57,13 @@ jobs: deploy: machine: enabled: true - working_directory: /home/circleci/circleci-demo-workflows + working_directory: ~/circleci-demo-workflows environment: - HEROKU_APP: safe-wildwood-45845 steps: - checkout - attach_workspace: - at: /home/circleci/circleci-demo-workflows + at: ~/circleci-demo-workflows - run: name: Setup Heroku command: bash .circleci/setup-heroku.sh