commit 59b35277309a2424cbf8006091098beaa23837ce parent b04f3db116ae7e914ed64a945b1a01974d05a729 Author: David Eisinger <[email protected]> Date: Fri, 2 Feb 2024 00:18:25 -0500 Fix ImageMagick incompatibility on CI Diffstat:
| M | .github/workflows/deploy.yml | | | 5 | ----- |
| M | .gitignore | | | 1 | + |
| M | bin/dither/dither.rb | | | 18 | +++++++++--------- |
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml @@ -35,11 +35,6 @@ jobs: KEY: ${{ github.workspace }}/secret.key run: cd bin/dither && bundle exec ruby dither.rb >> dither.log 2>&1 & - - name: Install ImageMagick - run: | - sudo apt update - sudo apt install imagemagick - - name: Test build env: DITHER_SERVER: http://localhost:4567 diff --git a/.gitignore b/.gitignore @@ -2,3 +2,4 @@ public resources/_gen secret.key +bin/dither/tmp diff --git a/bin/dither/dither.rb b/bin/dither/dither.rb @@ -25,15 +25,15 @@ get "/*" do |path| -iter 1000000 ) - MiniMagick::Tool::Magick.new do |magick| - magick << @decrypted.path - magick.resize "#{geometry}^" - magick.gravity "center" - magick.extent geometry - magick.ordered_dither "o8x8" - magick.monochrome - magick << @dithered.path - end + convert = MiniMagick::Tool::Convert.new + convert << @decrypted.path + convert.resize "#{geometry}^" + convert.gravity "center" + convert.extent geometry + convert.ordered_dither "o8x8" + convert.monochrome + convert << @dithered.path + convert.call content_type "image/png" File.open(@dithered.path)