From ba72724721b3ac8799cd6f25339ed71ffda2642b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 17 May 2023 09:35:49 -0400 Subject: [PATCH] Move back to release verion of ruby_memcheck Shopify/ruby_memcheck#16 has been merged and released, so we can move back to released version of ruby_memcheck. --- .github/workflows/ci.yml | 2 +- Gemfile | 2 +- oci-images/nokogiri-test/ubuntu.dockerfile | 6 ------ oci-images/nokogiri-test/ubuntu.erb | 2 -- oci-images/nokogiri-test/ubuntu32.dockerfile | 6 ------ oci-images/nokogiri-test/ubuntu32.erb | 2 -- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f08f9949c87..47f99113b42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -333,7 +333,7 @@ jobs: - uses: vmactions/freebsd-vm@v0 with: usesh: true - prepare: pkg install -y ruby devel/ruby-gems pkgconf libxml2 libxslt git + prepare: pkg install -y ruby devel/ruby-gems pkgconf libxml2 libxslt run: | gem install bundler bundle install --local || bundle install diff --git a/Gemfile b/Gemfile index 1918cb0bb76..d3189fc5a42 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ group :development do # tests gem "minitest", "5.18.0" gem "minitest-reporters", "1.6.0" - gem "ruby_memcheck", git: "https://github.com/flavorjones/ruby_memcheck", ref: "flavorjones-nokogiri-huge-parse-option" + gem "ruby_memcheck" gem "rubyzip", "~> 2.3.2" gem "simplecov", "= 0.21.2" diff --git a/oci-images/nokogiri-test/ubuntu.dockerfile b/oci-images/nokogiri-test/ubuntu.dockerfile index 9c98fe2157d..3e5100d97d4 100644 --- a/oci-images/nokogiri-test/ubuntu.dockerfile +++ b/oci-images/nokogiri-test/ubuntu.dockerfile @@ -9,12 +9,6 @@ RUN apt-get upgrade -y RUN apt-get install -y apt-utils -# include_file debian-git.step -# -*- dockerfile -*- - -RUN apt-get install -y git-core - - # include_file debian-libxml-et-al.step # -*- dockerfile -*- diff --git a/oci-images/nokogiri-test/ubuntu.erb b/oci-images/nokogiri-test/ubuntu.erb index 0e3b17631c6..31bbd7ea293 100644 --- a/oci-images/nokogiri-test/ubuntu.erb +++ b/oci-images/nokogiri-test/ubuntu.erb @@ -2,8 +2,6 @@ FROM ubuntu:focal <%= include_file "debian-prelude.step" %> -<%= include_file "debian-git.step" %> - <%= include_file "debian-libxml-et-al.step" %> <%= include_file "debian-ruby.step" %> diff --git a/oci-images/nokogiri-test/ubuntu32.dockerfile b/oci-images/nokogiri-test/ubuntu32.dockerfile index 019313ebcf4..322012fcc1e 100644 --- a/oci-images/nokogiri-test/ubuntu32.dockerfile +++ b/oci-images/nokogiri-test/ubuntu32.dockerfile @@ -9,12 +9,6 @@ RUN apt-get upgrade -y RUN apt-get install -y apt-utils -# include_file debian-git.step -# -*- dockerfile -*- - -RUN apt-get install -y git-core - - # include_file debian-libxml-et-al.step # -*- dockerfile -*- diff --git a/oci-images/nokogiri-test/ubuntu32.erb b/oci-images/nokogiri-test/ubuntu32.erb index a75687c0168..1a238035784 100644 --- a/oci-images/nokogiri-test/ubuntu32.erb +++ b/oci-images/nokogiri-test/ubuntu32.erb @@ -2,8 +2,6 @@ FROM i386/ubuntu:focal <%= include_file "debian-prelude.step" %> -<%= include_file "debian-git.step" %> - <%= include_file "debian-libxml-et-al.step" %> <%= include_file "debian-ruby.step" %>