Skip to content

Commit

Permalink
Move back to release verion of ruby_memcheck
Browse files Browse the repository at this point in the history
Shopify/ruby_memcheck#16 has been merged and released, so we can move
back to released version of ruby_memcheck.
  • Loading branch information
peterzhu2118 committed May 17, 2023
1 parent e4593e3 commit ba72724
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 18 deletions.
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

0 comments on commit ba72724

Please sign in to comment.