Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

retire Ruby 2 + gems update + release 1.6 #91

Merged
merged 7 commits into from
Sep 14, 2023
Merged

retire Ruby 2 + gems update + release 1.6 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cf3f04
Update lockfiles ruby-update
renovate[bot] Aug 28, 2023
d78960f
fix standardrb
thomasLeclaire Aug 30, 2023
5059224
moved constants at the top of module
tdutreui-solocal Sep 13, 2023
0eaf519
remove unsupported ruby version
tdutreui-solocal Sep 13, 2023
5bf3785
update standardrb
tdutreui-solocal Sep 13, 2023
e0de986
require ruby version
tdutreui-solocal Sep 13, 2023
c9fedb1
new gem version + minimal ruby version
tdutreui-solocal Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ commands:
destination: test-results

jobs:
build_2_x:
docker:
- image: ruby:2.7.8
working_directory: ~/repo
steps:
- build

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thomasLeclaire do you know why this "build_2_x" step still appears in GitHub ? It's gone on CircleCI but still blocks validation on GitHub
Same on this simpler PR #92

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is the branches protections : defined there https://github.com/Effilab/bing_ads_ruby_sdk/settings/branch_protection_rules/4793994
just removed the 2.x one.

build_3_x:
docker:
- image: ruby:3.2.2
Expand All @@ -47,8 +40,7 @@ jobs:
- build

workflows:
version: 2
version: 3
build:
jobs:
- build_2_x
- build_3_x
1 change: 1 addition & 0 deletions .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.2
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ source "https://rubygems.org"
# Specify your gem's dependencies in bing_ads_ruby_sdk.gemspec
gemspec

gem "standard", "1.30.1"
gem "standard", "1.31.1"
2 changes: 1 addition & 1 deletion bing_ads_ruby_sdk.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require "bing_ads_ruby_sdk/version"

Gem::Specification.new do |spec|
spec.name = "bing_ads_ruby_sdk"
spec.required_ruby_version = ">= 2.3"
spec.required_ruby_version = ">= 3"

spec.version = BingAdsRubySdk::VERSION
spec.authors = %w[Effilab developers]
Expand Down
10 changes: 5 additions & 5 deletions lib/bing_ads_ruby_sdk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
require "bing_ads_ruby_sdk/railtie" if defined?(Rails)

module BingAdsRubySdk
TYPE_KEY = "@type"
ROOT_PATH = File.join(__dir__, "..")

def self.config
@configuration ||= BingAdsRubySdk::Configuration.new
end
Expand All @@ -18,9 +21,9 @@ def self.configure
yield(config)
end

def self.log(level, *args, &block)
def self.log(level, *, &block)
return unless config.log
config.logger.send(level, *args, &block)
config.logger.send(level, *, &block)
end

def self.root_path
Expand All @@ -30,7 +33,4 @@ def self.root_path
def self.type_key
TYPE_KEY
end

TYPE_KEY = "@type"
ROOT_PATH = File.join(__dir__, "..")
end
2 changes: 1 addition & 1 deletion lib/bing_ads_ruby_sdk/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

module BingAdsRubySdk
VERSION = "1.5.2"
VERSION = "1.6"
DEFAULT_SDK_VERSION = :v13
end