Skip to content

Moved tcpdf_add_font calls from bootstrap, to package step (master)#1697

Merged
craigcomstock merged 3 commits intocfengine:masterfrom
craigcomstock:ENT-12777/master
Apr 30, 2025
Merged

Moved tcpdf_add_font calls from bootstrap, to package step (master)#1697
craigcomstock merged 3 commits intocfengine:masterfrom
craigcomstock:ENT-12777/master

Conversation

@craigcomstock
Copy link
Contributor

@craigcomstock craigcomstock commented Apr 28, 2025

  • Revert "Added php-curl dependency to bootstrap-pr host"
  • Revert "Remove const visibility modifiers in tcpdf_static.php"
  • Moved tcpdf_add_font calls from bootstrap, to package step

bootstrap-pr job is green! Build Status (I cancelled the rest of the job after, good enough for me)

This reverts commit 96a5930.

Will re-work with a different fix.

Ticket: ENT-12777
Changelog: none
This reverts commit 6cb6ae8.

Will re-work with a different fix.

Ticket: ENT-12777
Changelog: none
tcpdf >= 6.8.0 requires php 7.1+ but we bootstrap for 3.21.x on debian-9 and sury.org has no stretch packages of newer php versions.

Use built php instead.
Ticket: ENT-12777
Changelog: none

(cherry picked from commit 177d48a)
@craigcomstock craigcomstock changed the title Moved tcpdf_add_font calls from bootstrap, to package step Moved tcpdf_add_font calls from bootstrap, to package step (master) Apr 28, 2025
@craigcomstock
Copy link
Contributor Author

@cf-bottom jenkins no tests, will cancel after bootstrap-pr job is green.

@cf-bottom
Copy link

@craigcomstock craigcomstock merged commit 74d0f4e into cfengine:master Apr 30, 2025
1 of 3 checks passed
@craigcomstock craigcomstock deleted the ENT-12777/master branch April 30, 2025 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants