Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move back to release verion of ruby_memcheck #2880

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 0 additions & 6 deletions oci-images/nokogiri-test/ubuntu.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 -*-

Expand Down
2 changes: 0 additions & 2 deletions oci-images/nokogiri-test/ubuntu.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down
6 changes: 0 additions & 6 deletions oci-images/nokogiri-test/ubuntu32.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 -*-

Expand Down
2 changes: 0 additions & 2 deletions oci-images/nokogiri-test/ubuntu32.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down