.circleci/config.yml in pwwka-0.22.5 vs .circleci/config.yml in pwwka-0.22.6

@@ -1,126 +1,168 @@
 # DO NOT MODIFY - this is managed by Git Reduce in goro
 #
 ---
 version: 2
 jobs:
-  ruby-2.5.3-rails-5.2:
+  release:
     docker:
-    - image: circleci/ruby:2.5.3
+    - image: circleci/ruby:2.6.4
+    steps:
+    - checkout
+    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
+    - run: bundle install --full-index
+    - run:
+        name: Artifactory login
+        command: mkdir -p ~/.gem && curl -u$ARTIFACTORY_USER:$ARTIFACTORY_TOKEN https://stitchfix01.jfrog.io/stitchfix01/api/gems/eng-gems/api/v1/api_key.yaml
+          > ~/.gem/credentials && chmod 0600 ~/.gem/credentials
+    - run:
+        name: Build/release gem to artifactory
+        command: bundle exec rake push_artifactory
+  ruby-2.6.4-rails-6.0:
+    docker:
+    - image: circleci/ruby:2.6.4
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.2
+        BUNDLE_GEMFILE: Gemfile.rails-6.0
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
+    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
     - run:
         name: Run Additional CI Steps
         command: if [ -e bin/additional-ci-steps ]; then bin/additional-ci-steps;
           fi
     - run:
         name: Notify Pager Duty
-        command: 'bundle exec y-notify #eng-platform'
+        command: bundle exec y-notify "#eng-platform-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.4.5-rails-5.2:
+  ruby-2.5.6-rails-6.0:
     docker:
-    - image: circleci/ruby:2.4.5
+    - image: circleci/ruby:2.5.6
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.2
+        BUNDLE_GEMFILE: Gemfile.rails-6.0
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
+    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
     - run:
         name: Run Additional CI Steps
         command: if [ -e bin/additional-ci-steps ]; then bin/additional-ci-steps;
           fi
     - run:
         name: Notify Pager Duty
-        command: 'bundle exec y-notify #eng-platform'
+        command: bundle exec y-notify "#eng-platform-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.5.3-rails-5.1:
+  ruby-2.6.4-rails-5.2:
     docker:
-    - image: circleci/ruby:2.5.3
+    - image: circleci/ruby:2.6.4
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.1
+        BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
+    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
     - run:
         name: Run Additional CI Steps
         command: if [ -e bin/additional-ci-steps ]; then bin/additional-ci-steps;
           fi
     - run:
         name: Notify Pager Duty
-        command: 'bundle exec y-notify #eng-platform'
+        command: bundle exec y-notify "#eng-platform-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.4.5-rails-5.1:
+  ruby-2.5.6-rails-5.2:
     docker:
-    - image: circleci/ruby:2.4.5
+    - image: circleci/ruby:2.5.6
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.1
+        BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
+    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
     - run:
         name: Run Additional CI Steps
         command: if [ -e bin/additional-ci-steps ]; then bin/additional-ci-steps;
           fi
     - run:
         name: Notify Pager Duty
-        command: 'bundle exec y-notify #eng-platform'
+        command: bundle exec y-notify "#eng-platform-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
 workflows:
   version: 2
   on-commit:
     jobs:
-    - ruby-2.5.3-rails-5.2:
+    - release:
         context: org-global
-    - ruby-2.4.5-rails-5.2:
+        requires:
+        - ruby-2.6.4-rails-6.0
+        - ruby-2.5.6-rails-6.0
+        - ruby-2.6.4-rails-5.2
+        - ruby-2.5.6-rails-5.2
+        filters:
+          tags:
+            only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?RC[-\.]?\d*)?$/
+          branches:
+            ignore: /.*/
+    - ruby-2.6.4-rails-6.0:
         context: org-global
-    - ruby-2.5.3-rails-5.1:
+        filters:
+          tags:
+            only: &1 /.*/
+    - ruby-2.5.6-rails-6.0:
         context: org-global
-    - ruby-2.4.5-rails-5.1:
+        filters:
+          tags:
+            only: *1
+    - ruby-2.6.4-rails-5.2:
         context: org-global
+        filters:
+          tags:
+            only: *1
+    - ruby-2.5.6-rails-5.2:
+        context: org-global
+        filters:
+          tags:
+            only: *1
   scheduled:
     triggers:
     - schedule:
         cron: 17 19 * * 1,2,3,4,5
         filters:
           branches:
             only:
             - master
     jobs:
-    - ruby-2.5.3-rails-5.2:
+    - ruby-2.6.4-rails-6.0:
         context: org-global
-    - ruby-2.4.5-rails-5.2:
+    - ruby-2.5.6-rails-6.0:
         context: org-global
-    - ruby-2.5.3-rails-5.1:
+    - ruby-2.6.4-rails-5.2:
         context: org-global
-    - ruby-2.4.5-rails-5.1:
+    - ruby-2.5.6-rails-5.2:
         context: org-global