diff --git a/.circleci/config.yml b/.circleci/config.yml index 06168738..1f4fc152 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,6 +2,7 @@ version: 2.1 orbs: gem-tool: appfolio/gem-tool@volatile + public-packages: https://raw.githubusercontent.com/appfolio/public-packages/v1/orbs/public-packages.yml commands: install_dependencies: @@ -58,6 +59,7 @@ workflows: - '3.4.8' - '3.3.10' after-checkout-steps: + - public-packages/setup - install_dependencies after-appraisal-install-steps: - run: @@ -77,6 +79,7 @@ workflows: - '3.4.8' - '3.3.10' after-checkout-steps: + - public-packages/setup - install_dependencies after-appraisal-install-steps: - run: @@ -96,6 +99,7 @@ workflows: - '3.4.8' - '3.3.10' after-checkout-steps: + - public-packages/setup - install_dependencies after-appraisal-install-steps: - run: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 47f71901..ca3221c1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,11 @@ registries: type: rubygems-server url: https://rubygems.pkg.github.com/appfolio token: "${{secrets.READ_ONLY_PACKAGES_CCIMU}}" + public-rubygems-packages: + type: rubygems-server + url: https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/ + jfrog-oidc-provider-name: appfolio-github-oidc + audience: jfrog-appfolio updates: - package-ecosystem: bundler directory: "/" diff --git a/Gemfile b/Gemfile index 957dce7d..3a163f3f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ # frozen_string_literal: true -source 'https://rubygems.org' # global source +source 'https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/' -source 'https://rubygems.org' do +source 'https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/' do gem 'appraisal', '>= 2.5', '< 3' gem 'bundler', '>= 2.6', '< 5' gem 'debug', '>= 1.11', '< 2' diff --git a/Rakefile b/Rakefile index 3f41746e..338bafd8 100644 --- a/Rakefile +++ b/Rakefile @@ -113,13 +113,10 @@ class SeleniumRunner puts "Running '#{command}'" return if @options[:dry] - specific_gemfile_env = Bundler.clean_env - - if gemfile - specific_gemfile_env['BUNDLE_GEMFILE'] = gemfile - end - - Bundler.send(:with_env, specific_gemfile_env) do + jfrog_creds = ENV['BUNDLE_APPFOLIO__JFROG__IO'] + Bundler.with_unbundled_env do + ENV['BUNDLE_GEMFILE'] = gemfile if gemfile + ENV['BUNDLE_APPFOLIO__JFROG__IO'] = jfrog_creds if jfrog_creds system(command) raise unless $?.exitstatus == 0 end diff --git a/test/test_apps/7.2/Gemfile b/test/test_apps/7.2/Gemfile index 4501ff62..cacb4818 100644 --- a/test/test_apps/7.2/Gemfile +++ b/test/test_apps/7.2/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' diff --git a/test/test_apps/7.2/engines/forum/Gemfile b/test/test_apps/7.2/engines/forum/Gemfile index 08217351..7919fb13 100644 --- a/test/test_apps/7.2/engines/forum/Gemfile +++ b/test/test_apps/7.2/engines/forum/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" # Declare your gem's dependencies in forum.gemspec. # Bundler will treat runtime dependencies like base dependencies, and @@ -11,7 +11,7 @@ gem "jquery-rails" # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. +# your gem. # To use debugger # gem 'debugger' diff --git a/test/test_apps/7.2/gemfiles/ruby_3.3.10.gemfile b/test/test_apps/7.2/gemfiles/ruby_3.3.10.gemfile index 82688b88..c3a69711 100644 --- a/test/test_apps/7.2/gemfiles/ruby_3.3.10.gemfile +++ b/test/test_apps/7.2/gemfiles/ruby_3.3.10.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 7.2.0" diff --git a/test/test_apps/7.2/gemfiles/ruby_3.4.8.gemfile b/test/test_apps/7.2/gemfiles/ruby_3.4.8.gemfile index 82688b88..c3a69711 100644 --- a/test/test_apps/7.2/gemfiles/ruby_3.4.8.gemfile +++ b/test/test_apps/7.2/gemfiles/ruby_3.4.8.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 7.2.0" diff --git a/test/test_apps/7.2/gemfiles/ruby_4.0.1.gemfile b/test/test_apps/7.2/gemfiles/ruby_4.0.1.gemfile index 82688b88..c3a69711 100644 --- a/test/test_apps/7.2/gemfiles/ruby_4.0.1.gemfile +++ b/test/test_apps/7.2/gemfiles/ruby_4.0.1.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 7.2.0" diff --git a/test/test_apps/8.0/Gemfile b/test/test_apps/8.0/Gemfile index 0fc8fc78..56965544 100644 --- a/test/test_apps/8.0/Gemfile +++ b/test/test_apps/8.0/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' diff --git a/test/test_apps/8.0/engines/forum/Gemfile b/test/test_apps/8.0/engines/forum/Gemfile index 08217351..7919fb13 100644 --- a/test/test_apps/8.0/engines/forum/Gemfile +++ b/test/test_apps/8.0/engines/forum/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" # Declare your gem's dependencies in forum.gemspec. # Bundler will treat runtime dependencies like base dependencies, and @@ -11,7 +11,7 @@ gem "jquery-rails" # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. +# your gem. # To use debugger # gem 'debugger' diff --git a/test/test_apps/8.0/gemfiles/ruby_3.3.10.gemfile b/test/test_apps/8.0/gemfiles/ruby_3.3.10.gemfile index 426af238..7225eab8 100644 --- a/test/test_apps/8.0/gemfiles/ruby_3.3.10.gemfile +++ b/test/test_apps/8.0/gemfiles/ruby_3.3.10.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 8.0.0" diff --git a/test/test_apps/8.0/gemfiles/ruby_3.4.8.gemfile b/test/test_apps/8.0/gemfiles/ruby_3.4.8.gemfile index 426af238..7225eab8 100644 --- a/test/test_apps/8.0/gemfiles/ruby_3.4.8.gemfile +++ b/test/test_apps/8.0/gemfiles/ruby_3.4.8.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 8.0.0" diff --git a/test/test_apps/8.0/gemfiles/ruby_4.0.1.gemfile b/test/test_apps/8.0/gemfiles/ruby_4.0.1.gemfile index 426af238..7225eab8 100644 --- a/test/test_apps/8.0/gemfiles/ruby_4.0.1.gemfile +++ b/test/test_apps/8.0/gemfiles/ruby_4.0.1.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "minitest", "~> 5.0" gem "rails", "~> 8.0.0" diff --git a/test/test_apps/8.1/Gemfile b/test/test_apps/8.1/Gemfile index 066a8fa3..aa0caf63 100644 --- a/test/test_apps/8.1/Gemfile +++ b/test/test_apps/8.1/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' diff --git a/test/test_apps/8.1/engines/forum/Gemfile b/test/test_apps/8.1/engines/forum/Gemfile index 08217351..7919fb13 100644 --- a/test/test_apps/8.1/engines/forum/Gemfile +++ b/test/test_apps/8.1/engines/forum/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" # Declare your gem's dependencies in forum.gemspec. # Bundler will treat runtime dependencies like base dependencies, and @@ -11,7 +11,7 @@ gem "jquery-rails" # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. +# your gem. # To use debugger # gem 'debugger' diff --git a/test/test_apps/8.1/gemfiles/ruby_3.3.10.gemfile b/test/test_apps/8.1/gemfiles/ruby_3.3.10.gemfile index 729c13a6..6fbf0dba 100644 --- a/test/test_apps/8.1/gemfiles/ruby_3.3.10.gemfile +++ b/test/test_apps/8.1/gemfiles/ruby_3.3.10.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "rails", "~> 8.1.0" gem "sqlite3", "~> 2.1" diff --git a/test/test_apps/8.1/gemfiles/ruby_3.4.8.gemfile b/test/test_apps/8.1/gemfiles/ruby_3.4.8.gemfile index 729c13a6..6fbf0dba 100644 --- a/test/test_apps/8.1/gemfiles/ruby_3.4.8.gemfile +++ b/test/test_apps/8.1/gemfiles/ruby_3.4.8.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "rails", "~> 8.1.0" gem "sqlite3", "~> 2.1" diff --git a/test/test_apps/8.1/gemfiles/ruby_4.0.1.gemfile b/test/test_apps/8.1/gemfiles/ruby_4.0.1.gemfile index 729c13a6..6fbf0dba 100644 --- a/test/test_apps/8.1/gemfiles/ruby_4.0.1.gemfile +++ b/test/test_apps/8.1/gemfiles/ruby_4.0.1.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" gem "rails", "~> 8.1.0" gem "sqlite3", "~> 2.1" diff --git a/test/test_apps/shared/engines/forum/Gemfile b/test/test_apps/shared/engines/forum/Gemfile index 08217351..7919fb13 100644 --- a/test/test_apps/shared/engines/forum/Gemfile +++ b/test/test_apps/shared/engines/forum/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://appfolio.jfrog.io/artifactory/api/gems/appfolio-ae_page_objects-gem/" # Declare your gem's dependencies in forum.gemspec. # Bundler will treat runtime dependencies like base dependencies, and @@ -11,7 +11,7 @@ gem "jquery-rails" # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. +# your gem. # To use debugger # gem 'debugger'