diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8883f817..409eaa34 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,8 @@ name: Build and push docker images on: workflow_dispatch: push: + branches: + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -101,7 +103,7 @@ jobs: rb_sys_dock_cache_dir="$HOME/.cache/rb-sys-dock" sudo chmod 777 tmp/oxi-test cd tmp/oxi-test - sed -i "s|gem 'rb_sys', '.*'|gem 'rb_sys', path: '$rb_sys_gem_path/gem'|" Gemfile + ruby -e "File.write('Gemfile', File.read('Gemfile').gsub(/gem .rb_sys.*$/, 'gem \"rb_sys\", git: \"https://github.com/oxidize-rb/rb-sys\", ref: \"$GITHUB_SHA\"'))" mkdir .cargo echo "[patch.crates-io]" >> .cargo/config.toml diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 225a8132..a93fe10d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,21 +19,19 @@ jobs: repo: - name: "oxidize-rb/oxi-test" slug: oxi-test - ref: main - run: | - bundle install --jobs 3 --retry 3 - bundle exec rake + ref: ead2c358a6cde270863e686c7302fb56a333febc + run: bundle exec rake compile && bundle exec ruby -rminitest/autorun -Itest test/oxi/test_test.rb && cargo test - name: "matsadler/magnus" slug: magnus-0.5 ref: "0.5.5" run: cargo test - name: "matsadler/magnus" slug: magnus-head - ref: "627755429885eb1a84929e4d876f8cd8ec7303cf" + ref: "52a0817d4327cf78f91958f6b84f66946251fc9c" run: cargo test os: ["ubuntu-latest", "windows-latest", "macos-latest"] rust: ["stable"] - ruby: ["2.7", "3.2", "3.3"] + ruby: ["3.0", "3.2", "3.3"] runs-on: ${{ matrix.os }} steps: diff --git a/crates/rb-sys-build/src/cc.rs b/crates/rb-sys-build/src/cc.rs index d2e95d9b..d4f79dd2 100644 --- a/crates/rb-sys-build/src/cc.rs +++ b/crates/rb-sys-build/src/cc.rs @@ -92,7 +92,7 @@ impl Build { .with_extension("o"); let mut cmd = compiler; - cmd.args(&get_include_args(rb)) + cmd.args(get_include_args(rb)) .arg("-c") .arg(f) .args(&rb.cflags) diff --git a/crates/rb-sys-tests/Cargo.toml b/crates/rb-sys-tests/Cargo.toml index 0a6bb538..8fd70651 100644 --- a/crates/rb-sys-tests/Cargo.toml +++ b/crates/rb-sys-tests/Cargo.toml @@ -22,3 +22,8 @@ rusty-fork = "0.3.0" [build-dependencies] rb-sys-env = { path = "../rb-sys-env" } + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = [ + "cfg(ruby_has_ruby_abi_version,)", +] } diff --git a/crates/rb-sys/src/bindings.rs b/crates/rb-sys/src/bindings.rs index afd77aad..cc6604b2 100644 --- a/crates/rb-sys/src/bindings.rs +++ b/crates/rb-sys/src/bindings.rs @@ -13,6 +13,7 @@ #![allow(rustdoc::invalid_rust_codeblocks)] #![allow(rustdoc::invalid_html_tags)] #![allow(deprecated)] +#![allow(dead_code)] include!(env!("RB_SYS_BINDINGS_PATH")); diff --git a/docker/Dockerfile.aarch64-linux b/docker/Dockerfile.aarch64-linux index ceefa29d..ba2591f6 100644 --- a/docker/Dockerfile.aarch64-linux +++ b/docker/Dockerfile.aarch64-linux @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-aarch64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-aarch64-linux ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="aarch64-linux" \ diff --git a/docker/Dockerfile.aarch64-linux-musl b/docker/Dockerfile.aarch64-linux-musl index 9789c358..06055321 100644 --- a/docker/Dockerfile.aarch64-linux-musl +++ b/docker/Dockerfile.aarch64-linux-musl @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-aarch64-linux-musl +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-aarch64-linux-musl ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="aarch64-linux-musl" \ diff --git a/docker/Dockerfile.arm-linux b/docker/Dockerfile.arm-linux index f8ccd732..ba8ec854 100644 --- a/docker/Dockerfile.arm-linux +++ b/docker/Dockerfile.arm-linux @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-arm-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-arm-linux ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="arm-linux" \ diff --git a/docker/Dockerfile.arm64-darwin b/docker/Dockerfile.arm64-darwin index a67ccbc1..dc3a9d78 100644 --- a/docker/Dockerfile.arm64-darwin +++ b/docker/Dockerfile.arm64-darwin @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-arm64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-arm64-darwin ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="arm64-darwin" \ diff --git a/docker/Dockerfile.x64-mingw-ucrt b/docker/Dockerfile.x64-mingw-ucrt index 68a1874d..5383015c 100644 --- a/docker/Dockerfile.x64-mingw-ucrt +++ b/docker/Dockerfile.x64-mingw-ucrt @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x64-mingw-ucrt +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x64-mingw-ucrt ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x64-mingw-ucrt" \ diff --git a/docker/Dockerfile.x64-mingw32 b/docker/Dockerfile.x64-mingw32 index a3546f36..d81c5660 100644 --- a/docker/Dockerfile.x64-mingw32 +++ b/docker/Dockerfile.x64-mingw32 @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x64-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x64-mingw32 ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x64-mingw32" \ diff --git a/docker/Dockerfile.x86-linux b/docker/Dockerfile.x86-linux index 87c5a6db..49ad8661 100644 --- a/docker/Dockerfile.x86-linux +++ b/docker/Dockerfile.x86-linux @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x86-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x86-linux ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x86-linux" \ diff --git a/docker/Dockerfile.x86-mingw32 b/docker/Dockerfile.x86-mingw32 index b428928c..af320ae0 100644 --- a/docker/Dockerfile.x86-mingw32 +++ b/docker/Dockerfile.x86-mingw32 @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x86-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x86-mingw32 ARG LLVM_MINGW_VERSION=20231128 \ LLVM_MINGW_SHA256=2d532648bfd202bfe5edfa8b7f6c55970f65639779f34115a9a8bfa6f7d87f0b \ diff --git a/docker/Dockerfile.x86_64-darwin b/docker/Dockerfile.x86_64-darwin index ed4e322d..a0f1911b 100644 --- a/docker/Dockerfile.x86_64-darwin +++ b/docker/Dockerfile.x86_64-darwin @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x86_64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x86_64-darwin ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x86_64-darwin" \ diff --git a/docker/Dockerfile.x86_64-linux b/docker/Dockerfile.x86_64-linux index f1801ef8..acc0ba21 100644 --- a/docker/Dockerfile.x86_64-linux +++ b/docker/Dockerfile.x86_64-linux @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x86_64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x86_64-linux ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x86_64-linux" \ diff --git a/docker/Dockerfile.x86_64-linux-musl b/docker/Dockerfile.x86_64-linux-musl index c3ff062e..927a4031 100644 --- a/docker/Dockerfile.x86_64-linux-musl +++ b/docker/Dockerfile.x86_64-linux-musl @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.1-mri-x86_64-linux-musl +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.5.2-mri-x86_64-linux-musl ENV RUBY_CC_VERSION="3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x86_64-linux-musl" \