From 74e7a0a2fed259eb83381ece81f49bd65e764727 Mon Sep 17 00:00:00 2001 From: Sergei Tsoganov Date: Thu, 16 Mar 2023 13:26:57 +0200 Subject: [PATCH] Updated wkhtmltopdf-binaries --- .github/workflows/ruby.yml | 14 ++------------ Gemfile | 2 +- Gemfile.lock | 6 +++--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 120655655..7143a280d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] ruby: [ '2.7', '3.0.3' ] runs-on: ${{ matrix.os }} continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }} @@ -33,16 +33,6 @@ jobs: bundle config set deployment '[secure]' bundle env head -n1 $(which bundle) - - - name: Install wkhtmlpdf (push) - run: | - sudo apt-get update - wget http://ppa.launchpad.net/linuxuprising/libpng12/ubuntu/pool/main/libp/libpng/libpng12-0_1.2.54-1ubuntu1.1+1~ppa0~eoan_amd64.deb - sudo dpkg -i libpng12-0_1.2.54-1ubuntu1.1+1~ppa0~eoan_amd64.deb - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb - sudo apt-get install -y gdebi - sudo gdebi --non-interactive wkhtmltox_0.12.6-1.focal_amd64.deb - if: github.event_name == 'push' - name: Set ENV for codeclimate (pull_request) run: | @@ -99,7 +89,7 @@ jobs: fail-fast: false matrix: ruby: [ '2.7', '3.0.3' ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} diff --git a/Gemfile b/Gemfile index ecadca910..e8e568d10 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ gem 'e_invoice', github: 'internetee/e_invoice', branch: :master gem 'haml', '~> 6.0' gem 'lhv', github: 'internetee/lhv', branch: 'master' gem 'rexml' -gem 'wkhtmltopdf-binary', '~> 0.12.5.1' +gem 'wkhtmltopdf-binary', '~> 0.12.6.1' gem 'directo', github: 'internetee/directo', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index 6371f878d..35d1fe407 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -523,7 +523,7 @@ GEM websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - wkhtmltopdf-binary (0.12.5.4) + wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.6.7) @@ -597,7 +597,7 @@ DEPENDENCIES webdrivers webmock whenever (= 1.0.0) - wkhtmltopdf-binary (~> 0.12.5.1) + wkhtmltopdf-binary (~> 0.12.6.1) BUNDLED WITH - 2.4.3 + 2.4.8