From 455dda4dc1b0230cfdc65095f107fa8e526de76a Mon Sep 17 00:00:00 2001 From: Ian Ker-Seymer Date: Sat, 28 Dec 2024 13:01:38 -0500 Subject: [PATCH] Bump RCD images to 1.7.0 (#472) * Bump RCD images to 1.7.0 * Update CI matrix for 3.4 --- .github/workflows/ci.yml | 17 ++--------------- .vscode/settings.json | 3 ++- docker/Dockerfile.aarch64-linux | 2 +- docker/Dockerfile.aarch64-linux-musl | 2 +- docker/Dockerfile.arm-linux | 2 +- docker/Dockerfile.arm64-darwin | 2 +- docker/Dockerfile.x64-mingw-ucrt | 2 +- docker/Dockerfile.x64-mingw32 | 2 +- docker/Dockerfile.x86-linux | 2 +- docker/Dockerfile.x86-mingw32 | 2 +- docker/Dockerfile.x86_64-darwin | 2 +- docker/Dockerfile.x86_64-linux | 2 +- docker/Dockerfile.x86_64-linux-musl | 2 +- 13 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1649743..78dfd9cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: # Test against all versions supported by rubygems - ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-preview2"] + ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] sys: - os: ubuntu-latest rust_toolchain: ${{ needs.fetch_ci_data.outputs.minimum-supported-rust-version }} @@ -53,29 +53,16 @@ jobs: sys: os: macos-latest rust_toolchain: stable - - ruby_version: "ruby-debug" - sys: - os: ubuntu-24.04 - rust_toolchain: stable - ruby_version: mswin sys: os: windows-2022 rust_toolchain: stable-x86_64-pc-windows-msvc exclude: - # Missing symbols for some reason, need to fix - - ruby_version: "2.6" - sys: - os: macos-latest - rust_toolchain: stable - - ruby_version: "2.7" - sys: - os: macos-latest - rust_toolchain: stable - ruby_version: "3.1" sys: os: macos-latest rust_toolchain: stable - - ruby_version: "3.4.0-preview2" + - ruby_version: "3.4" sys: os: windows-2022 rust_toolchain: stable diff --git a/.vscode/settings.json b/.vscode/settings.json index d5ee38f3..1c7fd549 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,6 @@ "Cargo.toml", "./crates/rb-sys/Cargo.toml" ], - "rust-analyzer.showUnlinkedFileNotification": false + "rust-analyzer.showUnlinkedFileNotification": false, + "nixEnvSelector.suggestion": false } diff --git a/docker/Dockerfile.aarch64-linux b/docker/Dockerfile.aarch64-linux index 14a3c5d8..39dace49 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.6.0-mri-aarch64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-aarch64-linux ENV RUBY_CC_VERSION="3.4.0: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 c41662d6..de92a063 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.6.0-mri-aarch64-linux-musl +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-aarch64-linux-musl ENV RUBY_CC_VERSION="3.4.0: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 8f9a6569..43e90656 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.6.0-mri-arm-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-arm-linux ENV RUBY_CC_VERSION="3.4.0: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 3f89e960..32702d78 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.6.0-mri-arm64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-arm64-darwin ENV RUBY_CC_VERSION="3.4.0: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 6989a5b0..422a26d4 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.6.0-mri-x64-mingw-ucrt +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x64-mingw-ucrt ENV RUBY_CC_VERSION="3.4.0: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 5b05c7d4..fd78fd79 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.6.0-mri-x64-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x64-mingw32 ENV RUBY_CC_VERSION="3.4.0: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 6ffe43a9..4fc19399 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.6.0-mri-x86-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x86-linux ENV RUBY_CC_VERSION="3.4.0: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 5cff21e0..f7429700 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.6.0-mri-x86-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-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 e04a80e3..ae4e1552 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.6.0-mri-x86_64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x86_64-darwin ENV RUBY_CC_VERSION="3.4.0: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 cbd95d8e..59369cb6 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.6.0-mri-x86_64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x86_64-linux ENV RUBY_CC_VERSION="3.4.0: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 f47c6678..095c3837 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.6.0-mri-x86_64-linux-musl +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-x86_64-linux-musl ENV RUBY_CC_VERSION="3.4.0:3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0" \ RUBY_TARGET="x86_64-linux-musl" \