Commit 59b87221d for imagemagick.org
commit 59b87221dec394cfb31ef047bfd7e3c6443de58f
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Tue Oct 13 21:37:25 2026 +0200
Also use the pre-build dependencies for the daily linux build.
diff --git a/.github/build/windows/download-dependencies.sh b/.github/build/shared/download-dependencies.sh
old mode 100755
new mode 100644
similarity index 98%
rename from .github/build/windows/download-dependencies.sh
rename to .github/build/shared/download-dependencies.sh
index 93b90c32b..93c285ace
--- a/.github/build/windows/download-dependencies.sh
+++ b/.github/build/shared/download-dependencies.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
set -e
download_release()
diff --git a/.github/build/windows/download-dependencies.cmd b/.github/build/windows/download-dependencies.cmd
index 2a4a328fc..8a42186ad 100644
--- a/.github/build/windows/download-dependencies.cmd
+++ b/.github/build/windows/download-dependencies.cmd
@@ -8,4 +8,4 @@ call "%SCRIPT_DIR%find-bash.cmd"
call set "PATH=%%SCRIPT_DIR:%EXECUTION_DIR%=%%"
call set "LINUX_PATH=%PATH:\=/%"
-%BASH% -c "./%LINUX_PATH%/download-dependencies.sh --dependencies-artifact %1"
\ No newline at end of file
+%BASH% -c "./%LINUX_PATH%/../shared/download-dependencies.sh --dependencies-artifact %1"
\ No newline at end of file
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 817c74ccc..1fd8de307 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -69,12 +69,12 @@ jobs:
include:
- compiler: gcc
cxx_compiler: g++
- compiler_flags: -Wall -Wextra -Werror -Wno-builtin-declaration-mismatch
+ compiler_flags: -Wall -Wextra -Werror -Wno-builtin-declaration-mismatch -Wno-missing-field-initializers
packages: gcc g++
- compiler: clang
cxx_compiler: clang++
- compiler_flags: -Wall -Wextra -Werror -Wno-unused-function -Wno-incompatible-library-redeclaration -Wno-compound-token-split-by-macro
- packages: clang
+ compiler_flags: -Wall -Wextra -Werror -Wno-unused-function -Wno-incompatible-library-redeclaration -Wno-compound-token-split-by-macro -Wno-missing-field-initializers
+ packages: clang libstdc++-11-dev
steps:
- name: Install dependencies
@@ -82,7 +82,7 @@ jobs:
set -e
export DEBIAN_FRONTEND=noninteractive
apt update
- apt-get install -y autoconf libfontconfig1-dev libfreetype6-dev libltdl-dev make pkg-config ${{ matrix.packages }}
+ apt-get install -y autoconf curl libltdl-dev make pkg-config unzip ${{ matrix.packages }}
- name: Clone msttcorefonts
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
@@ -99,12 +99,23 @@ jobs:
with:
persist-credentials: false
+ - name: Download dependencies
+ shell: bash
+ run: |
+ bash .github/build/shared/download-dependencies.sh --dependencies-artifact linux-x64-static.zip
+ mv Artifacts /tmp/dependencies
+
- name: Configure ImageMagick
env:
CC: ${{ matrix.compiler }}
CXX: ${{ matrix.cxx_compiler }}
CFLAGS: ${{ matrix.compiler_flags }}
CXXFLAGS: ${{ matrix.compiler_flags }}
+ CPPFLAGS: -I/tmp/dependencies/include
+ LDFLAGS: -L/tmp/dependencies/lib -L/tmp/dependencies/lib/x86_64-linux-gnu
+ PKG_CONFIG_PATH: /tmp/dependencies/lib/pkgconfig:/tmp/dependencies/lib/x86_64-linux-gnu/pkgconfig
+ PKG_CONFIG: pkg-config --static
+ ac_cv_c_volatile: yes
run: |
./configure --with-perl --with-quantum-depth=${{matrix.quantum}} --enable-hdri=${{matrix.hdri}} --${{matrix.modules}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fc6f830b..a7ebbecb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
- configure
- m4/version.m4
- .github/build/windows/download-configure.sh
- - .github/build/windows/download-dependencies.sh
+ - .github/build/shared/download-dependencies.sh
- .github/workflows/release.yml
pull_request:
branches: