Skip to content

Commit 8d01050

Browse files
committed
Updating to latest version of quick_build.yml
1 parent 89b9d7b commit 8d01050

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/quick_build.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: QuickBuild v4.5 20241220
1+
name: QuickBuild v4.6 20250905
22

33
on:
44
push:
@@ -52,10 +52,12 @@ jobs:
5252
- name: PDFify
5353
if: ${{ env.action_is_release == 'YES' }}
5454
run: |
55-
sudo apt-get install -y wkhtmltopdf xvfb
55+
wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_amd64.deb
56+
sudo apt install -y ./wkhtmltox_0.12.6.1-3.jammy_amd64.deb && rm wkhtmltox_0.12.6.1-3.jammy_amd64.deb
57+
sudo apt install -y xvfb
5658
cd output
5759
for aa in *.html; do
58-
xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x16' /usr/bin/wkhtmltopdf \
60+
xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x16' $(which wkhtmltopdf) \
5961
--enable-local-file-access --javascript-delay 15000 --footer-right '[page]' \
6062
file://${PWD}/${aa}?expand=on ${aa}.pdf
6163
done
@@ -78,19 +80,19 @@ jobs:
7880
# run: echo "action_tdate=2002222" >> $GITHUB_ENV
7981
run: echo "action_tdate=$(cd transforms && git log -1 --format=%cs; cd ->/dev/null)" >> $GITHUB_ENV
8082

81-
# - name: Get DaisyDiff
82-
# run: |
83-
# wget -O- https://github.com/AndroidKitKat/ExecuteDaisy/archive/master.zip | jar -x
84-
# [ -d "output/images" ] || mkdir "output/images";
85-
# cp -u -r ExecuteDaisy-master/js ExecuteDaisy-master/css output;
86-
# cp -u ExecuteDaisy-master/images/* output/images;
83+
- name: Get DaisyDiff
84+
run: |
85+
wget -O- https://github.com/AndroidKitKat/ExecuteDaisy/archive/master.zip | jar -x
86+
[ -d "output/images" ] || mkdir "output/images";
87+
cp -u -r ExecuteDaisy-master/js ExecuteDaisy-master/css output;
88+
cp -u ExecuteDaisy-master/images/* output/images;
8789
8890
8991
- name: Make tmp dir
9092
run: mkdir tmp
9193

92-
# - name: diff
93-
# run: TMP=tmp make diff || true;
94+
- name: diff
95+
run: TMP=tmp make diff || true;
9496
# Little diff depends on having a git history.
9597
# The current checkout has depth=1 and has no history
9698
#- name: little diff

.github/workflows/quick_build_pdf.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: QuickBuild v4.5pdf 20250123
1+
name: QuickBuild v4.6pdf 20250905
22
# Run only on demand to do quick build with both pdf and html output
33

44
on:
@@ -48,10 +48,12 @@ jobs:
4848
# PDFify
4949
- name: PDFify
5050
run: |
51-
sudo apt-get install -y wkhtmltopdf xvfb
51+
wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_amd64.deb
52+
sudo apt install -y ./wkhtmltox_0.12.6.1-3.jammy_amd64.deb && rm wkhtmltox_0.12.6.1-3.jammy_amd64.deb
53+
sudo apt install -y xvfb
5254
cd output
5355
for aa in *.html; do
54-
xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x16' /usr/bin/wkhtmltopdf \
56+
xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x16' $(which wkhtmltopdf) \
5557
--enable-local-file-access --javascript-delay 15000 --footer-right '[page]' \
5658
file://${PWD}/${aa}?expand=on ${aa}.pdf
5759
done

0 commit comments

Comments
 (0)