diff --git a/.github/workflows/release_ruby_gem.yml b/.github/workflows/release_ruby_gem.yml index 7d6de383..bce8e59f 100644 --- a/.github/workflows/release_ruby_gem.yml +++ b/.github/workflows/release_ruby_gem.yml @@ -82,6 +82,12 @@ jobs: version: ${{ github.event.inputs.release_tag || inputs.release_tag }} file: rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec + # this is necessary because the cross-gem action doesn't support reading the Gemfile.lock from the subdirectory + # leading to a mismatch in the rb_sys version + - name: Copy Gemfile.lock to root + run: cp rspec-trunk-flaky-tests/Gemfile.lock ./Gemfile.lock + shell: bash + - uses: oxidize-rb/actions/cross-gem@v1 with: platform: ${{ matrix.platform }} diff --git a/.github/workflows/smoke_test_main.yml b/.github/workflows/smoke_test_main.yml index 3ae9b64a..5f53faa6 100644 --- a/.github/workflows/smoke_test_main.yml +++ b/.github/workflows/smoke_test_main.yml @@ -9,6 +9,7 @@ on: types: - staging-release - production-release + jobs: build_cli: name: Smoke test ${{ matrix.platform.name }} cli from release @@ -183,6 +184,12 @@ jobs: version: 0.0.0-${{ steps.get-sha.outputs.sha }} file: rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec + # this is necessary because the cross-gem action doesn't support reading the Gemfile.lock from the subdirectory + # leading to a mismatch in the rb_sys version + - name: Copy Gemfile.lock to root + run: cp rspec-trunk-flaky-tests/Gemfile.lock ./Gemfile.lock + shell: bash + - name: Build cross-compiled gem uses: oxidize-rb/actions/cross-gem@v1 with: diff --git a/rspec-trunk-flaky-tests/Cargo.lock b/rspec-trunk-flaky-tests/Cargo.lock index 742cf6a2..2cc3ff83 100644 --- a/rspec-trunk-flaky-tests/Cargo.lock +++ b/rspec-trunk-flaky-tests/Cargo.lock @@ -106,15 +106,11 @@ dependencies = [ "constants", "context", "display", - "http 1.3.1", - "log", + "http", "prost", "proto", "reqwest", - "sentry", "serde", - "serde_json", - "superconsole", "tokio", "tokio-retry", "tracing", @@ -313,17 +309,6 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" -[[package]] -name = "async-trait" -version = "0.1.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -381,8 +366,6 @@ dependencies = [ "prost-types", "protox", "serde", - "serde_json", - "tonic", "tonic-build", ] @@ -510,7 +493,6 @@ dependencies = [ "context", "futures-io", "glob", - "log", "prost", "proto", "regex", @@ -519,7 +501,6 @@ dependencies = [ "tar", "tempfile", "tracing", - "uuid", "zstd", ] @@ -693,11 +674,9 @@ dependencies = [ "glob", "indexmap", "lazy_static", - "log", "once_cell", "regex", "serde", - "serde_json", "thiserror 1.0.69", "tokio", "tracing", @@ -709,16 +688,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" -[[package]] -name = "colored" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" -dependencies = [ - "lazy_static", - "windows-sys 0.59.0", -] - [[package]] name = "compression-codecs" version = "0.4.32" @@ -745,19 +714,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width 0.2.2", - "windows-sys 0.59.0", -] - [[package]] name = "const_format" version = "0.2.35" @@ -792,7 +748,6 @@ dependencies = [ "codeowners", "gix", "lazy_static", - "log", "magnus", "openssl", "prost", @@ -1045,31 +1000,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "env_filter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" -dependencies = [ - "log", -] - -[[package]] -name = "env_logger" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" -dependencies = [ - "env_filter", - "log", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -2004,17 +1934,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.3.1" @@ -2026,17 +1945,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -2044,7 +1952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http", ] [[package]] @@ -2055,8 +1963,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -2082,8 +1990,8 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "httparse", "itoa", "pin-project-lite", @@ -2099,7 +2007,7 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", + "http", "hyper", "hyper-util", "rustls", @@ -2137,8 +2045,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "hyper", "ipnet", "libc", @@ -2615,7 +2523,7 @@ checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" dependencies = [ "cfg-if", "miette-derive", - "unicode-width 0.1.14", + "unicode-width", ] [[package]] @@ -3534,7 +3442,6 @@ version = "0.0.0" dependencies = [ "prost", "prost-build", - "prost-types", "prost-wkt-types", "protox", "serde", @@ -3751,18 +3658,18 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.103" +version = "0.9.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91dbe37ab6ac2fba187480fb6544b92445e41e5c6f553bf0c33743f3c450a1df" +checksum = "45fb1a185af97ee456f1c9e56dbe6e2e662bec4fdeaf83c4c28e0e6adfb18816" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.117" +version = "0.9.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59" +checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3" dependencies = [ "bindgen", "lazy_static", @@ -3858,8 +3765,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "hyper", "hyper-rustls", @@ -4725,8 +4632,6 @@ dependencies = [ "codeowners", "constants", "context", - "env_logger", - "log", "magnus", "prost", "prost-wkt-types", @@ -4747,11 +4652,7 @@ dependencies = [ name = "third-party" version = "0.1.0" dependencies = [ - "anyhow", - "env_logger", - "log", "sentry", - "sentry-log", ] [[package]] @@ -4918,17 +4819,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.17" @@ -4942,27 +4832,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-trait", - "base64 0.21.7", - "bytes", - "http 0.2.12", - "http-body 0.4.6", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic-build" version = "0.11.0" @@ -5000,8 +4869,8 @@ dependencies = [ "bitflags 2.10.0", "bytes", "futures-util", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "iri-string", "pin-project-lite", "tower", @@ -5089,16 +4958,13 @@ dependencies = [ "clap", "clap-verbosity-flag", "codeowners", - "colored", - "console", "constants", "context", "display", - "env_logger", "exitcode", "github-actions", "glob", - "http 1.3.1", + "http", "lazy_static", "log", "openssl", @@ -5115,11 +4981,8 @@ dependencies = [ "tempfile", "third-party", "tokio", - "tokio-retry", "tracing", - "tracing-log", "tracing-subscriber", - "url", "vergen", "xcresult", ] @@ -5261,12 +5124,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unicode-width" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" - [[package]] name = "unicode-xid" version = "0.2.6" @@ -5703,15 +5560,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" @@ -5948,6 +5796,7 @@ dependencies = [ "lazy_static", "petgraph 0.7.1", "prettyplease", + "proc-macro2", "quick-junit", "regex", "schemars", @@ -5955,7 +5804,6 @@ dependencies = [ "serde_json", "syn 2.0.110", "tracing", - "tracing-log", "tracing-subscriber", "typify", "uuid", diff --git a/rspec-trunk-flaky-tests/Gemfile b/rspec-trunk-flaky-tests/Gemfile index e711ecb2..0fc9d524 100644 --- a/rspec-trunk-flaky-tests/Gemfile +++ b/rspec-trunk-flaky-tests/Gemfile @@ -5,4 +5,4 @@ source 'https://rubygems.org' gemspec gem 'rake' -gem 'rake-compiler', '1.2.0' +gem 'rake-compiler', '1.3.1' diff --git a/rspec-trunk-flaky-tests/Gemfile.lock b/rspec-trunk-flaky-tests/Gemfile.lock index 083cc037..53ed90f7 100644 --- a/rspec-trunk-flaky-tests/Gemfile.lock +++ b/rspec-trunk-flaky-tests/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: rspec_trunk_flaky_tests (0.0.0) - rb_sys (= 0.9.103) + rb_sys (= 0.9.123) rspec-core (> 3.3) GEM @@ -10,9 +10,11 @@ GEM specs: diff-lcs (1.5.1) rake (13.2.1) - rake-compiler (1.2.0) + rake-compiler (1.3.1) rake - rb_sys (0.9.103) + rake-compiler-dock (1.10.0) + rb_sys (0.9.123) + rake-compiler-dock (= 1.10.0) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -35,7 +37,7 @@ PLATFORMS DEPENDENCIES rake - rake-compiler (= 1.2.0) + rake-compiler (= 1.3.1) rspec rspec_trunk_flaky_tests! diff --git a/rspec-trunk-flaky-tests/ext/rspec_trunk_flaky_tests/Cargo.toml b/rspec-trunk-flaky-tests/ext/rspec_trunk_flaky_tests/Cargo.toml index c502f1f6..d2940af7 100644 --- a/rspec-trunk-flaky-tests/ext/rspec_trunk_flaky_tests/Cargo.toml +++ b/rspec-trunk-flaky-tests/ext/rspec_trunk_flaky_tests/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.93" context = { path = "../../../context", features = ["git-access", "ruby"] } magnus = { version = "0.7" } test_report = { path = "../../../test_report", features = ["ruby"] } -rb-sys = { version = "=0.9.103", features = [ +rb-sys = { version = "=0.9.123", features = [ "link-ruby", "bindgen-rbimpls", "bindgen-deprecated-types", diff --git a/rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec b/rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec index e9c98ea5..8cb1e2d3 100644 --- a/rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec +++ b/rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.email = 'support@trunk.io' s.files = Dir['lib/**/*.rb', 'ext/**/*.{rs,rb}', '**/Cargo.*'] s.add_runtime_dependency('rspec-core', '>3.3') - s.add_dependency('rb_sys', '=0.9.103') + s.add_dependency('rb_sys', '=0.9.123') s.add_development_dependency('rspec') s.homepage = 'https://docs.trunk.io/flaky-tests/get-started/frameworks/rspec' s.license = 'MIT'