Merge branch 'master' into add-almalinux-support

Author: unixmonkey

.docker/Dockerfile-ubuntu_24.04

@@ -0,0 +1,8 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update
+RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.gitignore

@@ -1,27 +1,30 @@
 .DS_Store
 pkg/*
 Gemfile.lock
+bin/wkhtmltopdf_archlinux_amd64
 bin/wkhtmltopdf_centos_6_amd64
+bin/wkhtmltopdf_centos_6_i386
 bin/wkhtmltopdf_centos_7_amd64
+bin/wkhtmltopdf_centos_7_i386
 bin/wkhtmltopdf_centos_8_amd64
 bin/wkhtmltopdf_debian_9_amd64
-bin/wkhtmltopdf_debian_10_amd64
-bin/wkhtmltopdf_debian_11_amd64
-bin/wkhtmltopdf_debian_12_amd64
 bin/wkhtmltopdf_debian_9_arm64
+bin/wkhtmltopdf_debian_9_i386
+bin/wkhtmltopdf_debian_10_amd64
 bin/wkhtmltopdf_debian_10_arm64
+bin/wkhtmltopdf_debian_10_i386
+bin/wkhtmltopdf_debian_11_amd64
 bin/wkhtmltopdf_debian_11_arm64
+bin/wkhtmltopdf_debian_11_i386
+bin/wkhtmltopdf_debian_12_amd64
 bin/wkhtmltopdf_debian_12_arm64
+bin/wkhtmltopdf_debian_12_i386
 bin/wkhtmltopdf_macos_cocoa
 bin/wkhtmltopdf_ubuntu_16.04_amd64
+bin/wkhtmltopdf_ubuntu_16.04_i386
 bin/wkhtmltopdf_ubuntu_18.04_amd64
+bin/wkhtmltopdf_ubuntu_18.04_i386
 bin/wkhtmltopdf_ubuntu_20.04_amd64
 bin/wkhtmltopdf_ubuntu_20.04_arm64
+bin/wkhtmltopdf_ubuntu_21.10_amd64
 bin/wkhtmltopdf_ubuntu_22.04_amd64
-bin/wkhtmltopdf_centos_6_i386
-bin/wkhtmltopdf_centos_7_i386
-bin/wkhtmltopdf_debian_9_i386
-bin/wkhtmltopdf_debian_10_i386
-bin/wkhtmltopdf_ubuntu_16.04_i386
-bin/wkhtmltopdf_ubuntu_18.04_i386
-bin/wkhtmltopdf_archlinux_amd64

CHANGELOG.md

@@ -1,6 +1,9 @@
-# 0.12.6.x
+# 0.12.6.7
 
-- Setup of Github action automation for Linux/MacOS builds
+- Setup of GitHub action test automation for Linux/MacOS builds
+- Add URLs to gemspec for inclusion on Rubygems.org
+- Add support for several new Linux binaries for Debian, Centos, Ubuntu, Mint, Oracle, Tuxedo
+- Add support for several arm64 Linux binaries
 
 # 0.12.6.6
 

bin/wkhtmltopdf

@@ -38,14 +38,16 @@ suffix = case RbConfig::CONFIG['host_os']
 
            os = 'ubuntu_20.04' if os.start_with?('ubuntu_20.') ||
                                   os.start_with?('linuxmint_20.')
-           
+
 	         os = 'ubuntu_21.10' if os.start_with?('ubuntu_21.') ||
                                   os.start_with?('linuxmint_21.')
 
            os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.') ||
-                                  os.start_with?('tuxedo_22.')
+                                  os.start_with?('ubuntu_24.') ||
+                                  os.start_with?('tuxedo_22.') ||
+                                  os.start_with?('linuxmint_22')
 
-           os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2') ||
+           os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2' && os != 'amzn_2023') ||
                               (os.empty? && File.read('/etc/centos-release').start_with?('CentOS release 6'))
 
            os = 'centos_7' if (os.start_with?('amzn_2') && !os.start_with?('amzn_20')) ||
@@ -54,7 +56,9 @@ suffix = case RbConfig::CONFIG['host_os']
            os = 'centos_8' if os.start_with?('rocky_8') ||
                               os.start_with?('rhel_8.') ||
                               os.start_with?('ol_8.') ||
-                              os.start_with?('almalinux_8')
+                              os.start_with?('almalinux_8') ||
+                              os.start_with?('alinux_') ||
+                              os == 'amzn_2023'
 
            os_based_on_debian_9 = os.start_with?('debian_9') ||
                                   os.start_with?('deepin')

test/test_with_docker.rb

@@ -57,6 +57,10 @@ def test_with_ubuntu_22
    test_on_x86 with: 'ubuntu_22.04'
   end
 
+  def test_with_ubuntu_24
+    test_on_x86 with: 'ubuntu_24.04'
+   end
+
   def test_with_archlinux
     test_on_x86 with: 'archlinux'
   end

wkhtmltopdf-binary.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wkhtmltopdf-binary"
-  s.version = "0.12.6.6"
+  s.version = "0.12.6.7"
   s.license = "Apache-2.0"
   s.author = "Zakir Durumeric"
   s.email = "zakird@gmail.com"
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.require_path = '.'
   s.homepage = 'https://github.com/zakird/wkhtmltopdf_binary_gem'
 
-  spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  s.metadata['source_code_uri'] = s.homepage
+  s.metadata['changelog_uri'] = "#{s.homepage}/blob/master/CHANGELOG.md"
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "rake"