OPSEXP-2542 Fix build of arm64 RPMs (#96)

Co-authored-by: Alex Chapellon <alxgomz@gmail.com>

Author: gionn

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
 
   build_rpms:
     name: Build ${{ matrix.base_image }} ${{ matrix.target_arch }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
     needs:
       - configure
     strategy:
@@ -45,6 +45,10 @@ 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
@@ -66,7 +70,7 @@ jobs:
 
   test_rpms:
     name: Test ${{ matrix.base_image }} ${{ matrix.target_arch }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }}
     needs:
       - configure
       - build_rpms
@@ -93,6 +97,10 @@ 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/
@@ -142,7 +150,7 @@ jobs:
           file: ImageMagick-${{ steps.variables.outputs.imagemagick_version }}.${{ matrix.target_arch }}.rpm
           classifier: ${{ matrix.nexus_classifier }}
           files: ImageMagick-libs-${{ steps.variables.outputs.imagemagick_version }}.${{ matrix.target_arch }}.rpm
-          classifiers: ${{ matrix.nexus_classifier }}-libs
+          classifiers: libs-${{ matrix.nexus_classifier }}
           types: rpm
           maven-username: ${{ secrets.NEXUS_USERNAME }}
           maven-password: ${{ secrets.NEXUS_PASSWORD }}

release-version

@@ -1 +1 @@
-9
+10

rpms/Dockerfile

@@ -20,6 +20,7 @@ RUN if [ "$BASE_IMAGE" = "rockylinux:9" ]; then \
 
 WORKDIR /build
 COPY after-checkout-* /build/
+COPY tests/entrypoint.sh /tests.sh
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

rpms/after-checkout-rockylinux8-7.0.10-59.sh

@@ -22,13 +22,19 @@ TARGET_ARCH=$2
 echo "Preparing to build Imagemagick $IMAGEMAGICK_VERSION for $TARGET_ARCH..."
 
 git clone --depth 1 -b "$IMAGEMAGICK_VERSION" https://github.com/ImageMagick/ImageMagick.git
-
-# Generate updated .src.rpm
 cd ImageMagick
 
 # Drop LQR support
 sed -i '/BuildRequires.*lqr/d; /--with-lqr/d' ImageMagick.spec.in
-sed -i '/%package lib/a AutoReq: no' ImageMagick.spec.in
+
+# Drop Raqm support
+sed -i '/BuildRequires.*raqm/d; s/--with-raqm/--without-raqm/' ImageMagick.spec.in
+
+# Drop ghostscript support
+sed -i '/BuildRequires.*ghostscript-devel/d; s/--with-gslib/--without-gslib/' ImageMagick.spec.in
+
+# Drop LibRaw support which is not compatible with the current version of ImageMagick
+sed -i '/BuildRequires.*LibRaw/d; /--with-raw/d' ImageMagick.spec.in
 
 AFTER_CHECKOUT_HOOK_SCRIPT="../after-checkout-${BASE_IMAGE//:/}-$IMAGEMAGICK_VERSION.sh"
 if [ -x "$AFTER_CHECKOUT_HOOK_SCRIPT" ]; then
@@ -45,27 +51,11 @@ yum-builddep -y "ImageMagick-$IMAGEMAGICK_VERSION.src.rpm"
 rpmbuild --rebuild --nocheck --target "$TARGET_ARCH" "ImageMagick-$IMAGEMAGICK_VERSION.src.rpm"
 
 echo "Imagemagick $IMAGEMAGICK_VERSION for $TARGET_ARCH built successfully."
-ls  -lR /root/rpmbuild/RPMS
-
-if [ "$TARGET_ARCH" = "aarch64" ]; then
-    echo "Tests for this architecture are not available yet"
-    exit 0
-fi
-
-echo "Testing package expected dependencies"
-rpm -qp --requires /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'libcdt|libcgraph|libgvc|libgs|libMagickCore|libMagickWand'
-
-echo "Installing packages"
-yum install -y /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm
-yum install -y /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm
-
-echo "Testing convert command"
-convert -version
+ls  -lR /root/rpmbuild/RPMS/
 
-echo "Creating test image file"
-convert  -size 32x32 xc:transparent test.png
+cd "/root/rpmbuild/RPMS/$TARGET_ARCH"
 
-echo "Converting png to jpg"
-convert test.png test1.jpg
+echo "Testing package for unexpected dependencies"
+rpm -qp --requires ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'libgs'
 
-exit 0
+exec /tests.sh $IMAGEMAGICK_VERSION $TARGET_ARCH