Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Alfresco/imagemagick-build
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: Alfresco/imagemagick-build
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 5 commits
  • 6 files changed
  • 3 contributors

Commits on Jul 31, 2024

  1. OPSEXP-2760 Switch to new ARM64 runners (#100)

    [skip ci]
    gionn authored Jul 31, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    ea06cb8 View commit details

Commits on Oct 3, 2024

  1. Bump Alfresco/alfresco-build-tools from 5.31.0 to 7.1.0 (#105)

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    741d327 View commit details

Commits on Nov 15, 2024

  1. OPSEXP-2258 Enable testing rpms for arm64 (#111)

    pmacius authored Nov 15, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0700716 View commit details

Commits on Jan 13, 2025

  1. Bump Alfresco/alfresco-build-tools from 7.1.0 to 8.9.0 (#117)

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 13, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    672dc1a View commit details

Commits on Jan 15, 2025

  1. OPSEXP-3011 Build for ubuntu 24.04 (#116)

    gionn authored Jan 15, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    17eaf33 View commit details
Showing with 27 additions and 27 deletions.
  1. +7 −25 .github/workflows/build.yml
  2. +4 −0 debs/after-checkout-ubuntu2404-7.1.0-16.sh
  3. +10 −0 debs/config.json
  4. +2 −1 debs/debian/control
  5. +3 −0 debs/debian/rules
  6. +1 −1 release-version
32 changes: 7 additions & 25 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ jobs:
runs-on: ubuntu-latest
outputs:
matrix_rpms: ${{ steps.set-matrix.outputs.matrix_rpms }}
matrix_test: ${{ steps.set-matrix.outputs.matrix_test }}
matrix_debs: ${{ steps.set-matrix.outputs.matrix_debs }}
steps:
- name: Checkout to repository
@@ -24,11 +23,10 @@ jobs:
run: |
echo "matrix_rpms=$(jq -c . < ./rpms/config.json)" >> $GITHUB_OUTPUT
echo "matrix_debs=$(jq -c . < ./debs/config.json)" >> $GITHUB_OUTPUT
echo "matrix_test=$(jq -c 'del(.include[] | select(.target_arch == "aarch64"))' < rpms/config.json)" >> $GITHUB_OUTPUT
build_rpms:
name: Build ${{ matrix.base_image }} ${{ matrix.target_arch }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }}
needs:
- configure
strategy:
@@ -45,10 +43,6 @@ jobs:
echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT
echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT
- name: Setup Docker Engine
if: matrix.target_arch == 'aarch64'
uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0

- name: Prepare image
run: docker build . -t buildenv --build-arg BASE_IMAGE=${{ matrix.base_image }}
working-directory: rpms
@@ -70,12 +64,12 @@ jobs:

test_rpms:
name: Test ${{ matrix.base_image }} ${{ matrix.target_arch }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }}
needs:
- configure
- build_rpms
strategy:
matrix: ${{ fromJson(needs.configure.outputs.matrix_test) }}
matrix: ${{ fromJson(needs.configure.outputs.matrix_rpms) }}
fail-fast: false

steps:
@@ -97,10 +91,6 @@ jobs:
- name: List RPMs
run: ls -R rpms/tests/*.rpm

- name: Setup Docker Engine
if: matrix.target_arch == 'aarch64'
uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0

- name: Prepare image
run: docker build . -t testenv --build-arg BASE_IMAGE=${{ matrix.base_image }}
working-directory: rpms/tests/
@@ -139,7 +129,7 @@ jobs:
run: ls -R *.rpm

- name: Deploy to nexus
uses: Alfresco/alfresco-build-tools/.github/actions/maven-deploy-file@a288b9efdaa50413573b2e130896d906478b8e50
uses: Alfresco/alfresco-build-tools/.github/actions/maven-deploy-file@16272633584df58ea603112c4aac4564c8673cd6
if: startsWith(github.ref, 'refs/tags/v')
with:
group-id: org.imagemagick
@@ -157,7 +147,7 @@ jobs:

build_deb:
name: Build ${{ matrix.base_image }} ${{ matrix.target_arch }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }}
needs:
- configure
strategy:
@@ -174,10 +164,6 @@ jobs:
echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT
echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT
- name: Setup Docker Engine
if: matrix.target_arch == 'aarch64'
uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@a288b9efdaa50413573b2e130896d906478b8e50 # v5.31.0

- name: Prepare image
run: docker build . -t buildenv --build-arg BASE_IMAGE=${{ matrix.base_image }}
working-directory: debs
@@ -200,7 +186,7 @@ jobs:

test_deb:
name: Test ${{ matrix.base_image }} ${{ matrix.target_arch }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }}
needs:
- configure
- build_deb
@@ -221,10 +207,6 @@ jobs:
echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT
echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT
- name: Setup Docker Engine
if: matrix.target_arch == 'aarch64'
uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@a288b9efdaa50413573b2e130896d906478b8e50 # v5.31.0

- name: Download DEBs
uses: actions/download-artifact@v4
with:
@@ -275,7 +257,7 @@ jobs:
run: ls -R *.deb

- name: Deploy to nexus
uses: Alfresco/alfresco-build-tools/.github/actions/maven-deploy-file@a288b9efdaa50413573b2e130896d906478b8e50
uses: Alfresco/alfresco-build-tools/.github/actions/maven-deploy-file@16272633584df58ea603112c4aac4564c8673cd6
if: startsWith(github.ref, 'refs/tags/v')
with:
group-id: org.imagemagick
4 changes: 4 additions & 0 deletions debs/after-checkout-ubuntu2404-7.1.0-16.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash -e
sed -i "s/libtiff5/libtiff6/g" debian/control
sed -i "s/mime-support/mailcap,media-types/g" debian/control
sed -i "s/libraw-dev,//g" debian/control
10 changes: 10 additions & 0 deletions debs/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"include": [
{
"base_image": "ubuntu:24.04",
"target_arch": "x86_64",
"nexus_classifier": "ub2404-amd64"
},
{
"base_image": "ubuntu:24.04",
"target_arch": "aarch64",
"nexus_classifier": "ub2404-arm64"
},
{
"base_image": "ubuntu:22.04",
"target_arch": "x86_64",
3 changes: 2 additions & 1 deletion debs/debian/control
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@ Source: imagemagick-alfresco
Section: graphics
Priority: optional
Maintainer: Alfresco Ops Readiness <alfresco-build@hyland.com>
Build-Depends: autotools-dev, ghostscript, gsfonts, libjbig-dev,
Build-Depends: autotools-dev, libjbig-dev,
ghostscript, gsfonts, fonts-dejavu-core,
libsm6, libfftw3-dev, liblcms2-dev, gawk, zlib1g-dev,
libglib2.0-dev, libzip-dev, libfribidi-dev, mime-support,
libxdmcp-dev, liblzma-dev, libjpeg-turbo8, libpng-dev,
3 changes: 3 additions & 0 deletions debs/debian/rules
Original file line number Diff line number Diff line change
@@ -32,6 +32,9 @@ override_dh_auto_configure:
--with-modules \
--with-quantum-depth=16 \
--with-gs-font-dir=/usr/share/fonts/type1/gsfonts \
--with-dejavu-font-dir=/usr/share/fonts/truetype/dejavu \
--with-urw-base35-font-dir=none \
--with-urw-base35-type1-font-dir=none \
--with-magick-plus-plus \
--with-djvu \
--with-gslib \
2 changes: 1 addition & 1 deletion release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
11