Skip to content

Commit 84974e7

Browse files
qwlongqwlong
authored
Merge branch 'master' into master
2 parents d1c2c48 + 8d40094 commit 84974e7

27 files changed

+256
-42
lines changed

‎.docker/Dockerfile-archlinux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ FROM archlinux
22

33
ENV DEBIAN_FRONTEND noninteractive
44

5-
RUN pacman -Sy --noconfirm ruby fontconfig freetype2 libjpeg libpng libxext libxrender
5+
RUN pacman -Sy --noconfirm ruby fontconfig freetype2 libjpeg libpng libxext libxrender openssl-1.1
66

77
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_10_arm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM --platform=arm64 debian:10
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_11‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM debian:11
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_11_arm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM --platform=arm64 debian:11
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_12‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM debian:12
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_12_arm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM --platform=arm64 debian:12
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_9‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ FROM debian:9
22

33
ENV DEBIAN_FRONTEND noninteractive
44

5-
RUN apt-get update
5+
RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
6+
echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list
7+
8+
RUN apt-get -o Acquire::Check-Valid-Until=false update && \
9+
apt-get -o Acquire::AllowInsecureRepositories=true update
10+
611
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
712

813
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-debian_9_arm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=arm64 debian:9
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
6+
echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list
7+
8+
RUN apt-get -o Acquire::Check-Valid-Until=false update && \
9+
apt-get -o Acquire::AllowInsecureRepositories=true update
10+
11+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
12+
13+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.docker/Dockerfile-oraclelinux_8‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM oraclelinux:8
2+
3+
RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
4+
5+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

‎.github/workflows/ci.yml‎

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ name: CI
33
on: [push, pull_request]
44

55
jobs:
6-
tests:
7-
runs-on: ${{ matrix.os }}
6+
tests-on-x86-mac:
7+
runs-on: macos-13
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, macos-latest]
11-
ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
10+
ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
1211
steps:
13-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1413

1514
- name: Install Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
1615
uses: ruby/setup-ruby@v1
@@ -22,3 +21,48 @@ jobs:
2221

2322
- name: Run tests with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
2423
run: bundle exec rake
24+
tests-on-x86-docker:
25+
runs-on: ubuntu-latest
26+
strategy:
27+
matrix:
28+
ruby-version: ['3.2']
29+
steps:
30+
- uses: actions/checkout@v4
31+
32+
- name: Install Ruby ${{ matrix.ruby-version }} on ubuntu
33+
uses: ruby/setup-ruby@v1
34+
with:
35+
ruby-version: ${{ matrix.ruby-version }}
36+
37+
- name: Install dependencies
38+
run: bundle install
39+
40+
- name: Run tests on docker(x86)
41+
run: bundle exec rake
42+
tests-on-arm:
43+
runs-on: ubuntu-latest
44+
strategy:
45+
matrix:
46+
ruby-version: ['3.2']
47+
steps:
48+
- name: Set up QEMU
49+
uses: docker/setup-qemu-action@v3
50+
with:
51+
platforms: arm64
52+
- uses: actions/checkout@v4
53+
- name: Install Ruby ${{ matrix.ruby-version }} on ubuntu
54+
uses: ruby/setup-ruby@v1
55+
with:
56+
ruby-version: ${{ matrix.ruby-version }}
57+
- name: Run tests on docker(arm64)
58+
env:
59+
ARM: 1
60+
COMPOSE_FILE: docker-compose-arm.yml
61+
run: |
62+
set -xeu
63+
sudo apt update
64+
sudo apt-get install -y docker-compose
65+
bundle install
66+
bundle exec rake
67+
68+

0 commit comments

Comments
 (0)