Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/test-compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
fail-fast: false
matrix:
include:
- { ruby_version: '4.0', corruption: false, expected_exit_code: 0 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.4', corruption: false, expected_exit_code: 0 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.3', corruption: false, expected_exit_code: 0 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.2', corruption: false, expected_exit_code: 0 }
Expand All @@ -21,7 +22,9 @@ jobs:
- { ruby_version: '2.6', corruption: false, expected_exit_code: 0 }
- { ruby_version: '2.5', corruption: false, expected_exit_code: 0 } # Used by `dd-trace-rb` for compilation

# Corruption tests
# "Corruption" tests: Validate that missing a file really breaks compilation (and thus our tests are working)
# On Rubies that don't use the source, this validates that indeed they aren't using any of these files.
- { ruby_version: '4.0', corruption: true, expected_exit_code: 1 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.4', corruption: true, expected_exit_code: 1 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.3', corruption: true, expected_exit_code: 1 } # Used by `dd-trace-rb` for compilation
- { ruby_version: '3.2', corruption: true, expected_exit_code: 0 }
Expand Down
2 changes: 1 addition & 1 deletion lib/datadog/ruby_core_source/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Datadog
module RubyCoreSource
VERSION = '3.4.1'
VERSION = '3.4.2'
Copy link
Member

Choose a reason for hiding this comment

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

Do we still merge-rebase-sync with upstream or do we do things 100% our own way these days?

Should there be a Ruby 3.4.2 then we'd be kind of out of beat in a misleading and confusing way. Maybe using a suffix like 3.4.1.1?

Or... debase-ruby_core_source has released a 4.0.0.preview2. Would that work?

Or we simply do away with pretending to sync and just do our own very-obviously-not-sync'd versioning like 10.x.z or 2025.u.v.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah we're not in sync with upstream anymore -- we've changed a bit the helpers, only carry a subset of the headers, etc. I mentioned in the PR description:

Why version 3.4.2? Adding more headers is backwards-compatible, and while upstream was keeping gem version 1:1 with ruby version, it's awkward to do that with Ruby preview releases so I just bumped the patch 🤷 . We can decide to bump the major once 4.0 stable is out.

I think we should just decouple from Ruby versions, at least for now. We can always re-align once 4.0.0 comes out and we delete the 3.5.0-preview1 and 4.0.0-preview2 headers?

end
end