From 40899cdaf107a76664781eff47c7c9602a8170ca Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 13 Jan 2023 08:33:14 -0500 Subject: [PATCH] dep: update to rake-compiler-dock 1.3.0 --- .github/workflows/gem-install.yml | 13 ++++++++----- sqlite3.gemspec | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index 2fc981c0..674a13bb 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -16,8 +16,10 @@ on: - '*' jobs: - cache-tarball: + setup: runs-on: ubuntu-latest + outputs: + rcd_image_version: ${{steps.rcd_image_version.outputs.rcd_image_version}} steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -29,9 +31,11 @@ jobs: ruby-version: "3.1" bundler-cache: true - run: bundle exec ruby ./ext/sqlite3/extconf.rb --download-dependencies + - id: rcd_image_version + run: bundle exec ruby -e 'require "rake_compiler_dock"; puts "rcd_image_version=#{RakeCompilerDock::IMAGE_VERSION}"' >> $GITHUB_OUTPUT cruby-package: - needs: ["cache-tarball"] + needs: ["setup"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -139,7 +143,7 @@ jobs: ruby -rsqlite3 -e 'puts SQLite3::SQLITE_LOADED_VERSION' cruby-native-package: - needs: ["cache-tarball"] + needs: ["setup"] strategy: fail-fast: false matrix: @@ -160,8 +164,7 @@ jobs: path: ports/archives key: ports-archives-tarball-${{hashFiles('ext/sqlite3/extconf.rb','dependencies.yml')}} - env: - # DOCKER_IMAGE: "larskanis/rake-compiler-dock-mri-${{matrix.plat}}:1.2.1" - DOCKER_IMAGE: "ghcr.io/rake-compiler/rake-compiler-dock-snapshot:${{matrix.plat}}" + DOCKER_IMAGE: "ghcr.io/rake-compiler/rake-compiler-dock-image:${{needs.setup.outputs.rcd_image_version}}-mri-${{matrix.plat}}" run: | docker run --rm -v "$(pwd):/sqlite3" -w /sqlite3 ${DOCKER_IMAGE} \ ./bin/test-gem-build gems ${{matrix.plat}} diff --git a/sqlite3.gemspec b/sqlite3.gemspec index 8e3fcb28..5f9be35f 100644 --- a/sqlite3.gemspec +++ b/sqlite3.gemspec @@ -110,7 +110,7 @@ Gem::Specification.new do |s| s.add_development_dependency("minitest", "~> 5.15") s.add_development_dependency("rake-compiler", "~> 1.2.0") - s.add_development_dependency("rake-compiler-dock", "~> 1.2.1") + s.add_development_dependency("rake-compiler-dock", "1.3.0") s.add_development_dependency("rdoc", ">= 4.0", "< 7") s.add_development_dependency("psych", "~> 4.0") # psych 5 doesn't build on some CI platforms yet