build: testing a Windows/Aarch64 build.

Note: the additional `rm` call was done for this error: > + mv _install-arm64 /home/SYSTEM > mv: cannot move '_install-arm64' to '/home/SYSTEM/_install-arm64': Directory not empty I guess the home directory is not properly wiped-out between runs, which is not a huge problem as long as the runner is private to our project. Let's clean things ourselves.
2023-09-28 13:55:38 +02:00 · 2023-09-28 13:55:38 +02:00 · b4a06737c0
parent 5c28355d5e
commit b4a06737c0
4 changed files with 111 additions and 6 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -18,7 +18,8 @@
 # - GIMP_CI_CROSSROAD_WIN64: trigger the crossroad/meson build for Win 64-bit.
 # - GIMP_CI_MSYS2_WIN32: trigger the native MSYS2 build for Win 32-bit.
 # - GIMP_CI_MSYS2_WIN64: trigger the native MSYS2 build for Win 64-bit.
-# - GIMP_CI_WIN_INSTALLER: trigger both native MSYS2 builds then creates Windows installer.
+# - GIMP_CI_MSYS2_WIN_AARCH64: trigger the native MSYS2 build for Windows/Aarch64.
+# - GIMP_CI_WIN_INSTALLER: trigger all native MSYS2 builds then creates Windows installer.
 # - GIMP_CI_SOURCES: trigger the meson/gcc build and the source tarball job.
 # - GIMP_CI_CPPCHECK: trigger cppcheck static analysis.
 # - GIMP_CI_FLATPAK: trigger the nightly flatpak build and publishing.
@ -375,7 +376,7 @@ gimp-meson-raster-icons:
    - ninja -C _build
    - ninja -C _build test

-## WINDOWS 64-bit CI (native MSYS2) ##
+## WINDOWS x86_64 CI (native MSYS2) ##

 deps-win64-native:
  rules:
@ -462,7 +463,7 @@ packaging-win64-native:
    - done-dll.list
  needs: ["gimp-win64-native"]

-## WINDOWS 32-bit CI (native MSYS2) ##
+## WINDOWS x86 CI (native MSYS2) ##

 deps-win32-native:
  rules:
@ -548,6 +549,93 @@ packaging-win32-native:
    - done-dll.list
  needs: ["gimp-win32-native"]

+## WINDOWS Aarch64 CI (native MSYS2) ##
+
+deps-win-aarch64-native:
+  rules:
+    # On releases.
+    - if: '$CI_COMMIT_TAG != null'
+    # Custom builds though web GUI, API or schedules.
+    - if: '$GIMP_CI_MSYS2_WIN_AARCH64 != null'
+    - if: '$GIMP_CI_WIN_INSTALLER != null'
+    # Merge requests with appropriate label.
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*5. Windows Installer.*/'
+  stage: dependencies
+  variables:
+    MSYSTEM: "CLANGARM64"
+    CHERE_INVOKING: "yes"
+  tags:
+    - windows-aarch64
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-deps-msys2.sh"
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
+    when: always
+    expire_in: 2 hours
+    paths:
+      - _install-arm64
+  needs: []
+
+gimp-win-aarch64-native:
+  rules:
+    # On releases.
+    - if: '$CI_COMMIT_TAG != null'
+    # Custom builds though web GUI, API or schedules.
+    - if: '$GIMP_CI_MSYS2_WIN_AARCH64 != null'
+    - if: '$GIMP_CI_WIN_INSTALLER != null'
+    # Merge requests with appropriate label.
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*5. Windows Installer.*/'
+  stage: gimp
+  variables:
+    MSYSTEM: "CLANGARM64"
+    CHERE_INVOKING: "yes"
+  tags:
+    - windows-aarch64
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
+    when: always
+    expire_in: 1 day
+    paths:
+    - _install-arm64
+    - _build-arm64/build/windows/installer/
+    - _build-arm64/meson-*/
+  cache:
+    paths:
+    - _ccache/
+  needs: ["deps-win-aarch64-native"]
+
+packaging-win-aarch64-native:
+  rules:
+    # On releases.
+    - if: '$CI_COMMIT_TAG != null'
+    # Custom builds though web GUI, API or schedules.
+    - if: '$GIMP_CI_WIN_INSTALLER != null'
+    # Merge requests with appropriate label.
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*5. Windows Installer.*/'
+  stage: packaging
+  variables:
+    MSYSTEM: "CLANGARM64"
+    CHERE_INVOKING: "yes"
+  tags:
+    - windows-aarch64
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
+    - cd gimp-arm64
+    - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/split-debug-msys2.sh"
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
+    when: always
+    expire_in: 1 day
+    paths:
+    - gimp-arm64
+    - done-dll.list
+  needs: ["gimp-win-aarch64-native"]
+
 ## WINDOWS 64-bit CI (cross-build crossroad) ##

 deps-win64:
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@ -10,12 +10,18 @@ if [[ "$MSYSTEM" == "MINGW32" ]]; then
    export BABL_OPTIONS="-Denable-vapi=false"
    export GEGL_OPTIONS="-Dvapigen=disabled"
    export MSYS_PREFIX="/c/msys64/mingw32/"
-else
+elif [[ "$MSYSTEM" == "MINGW64" ]]; then
    export ARTIFACTS_SUFFIX="-w64"
    export MSYS2_ARCH="x86_64"
    export BABL_OPTIONS=""
    export GEGL_OPTIONS=""
    export MSYS_PREFIX="/c/msys64/mingw64/"
+else # [[ "$MSYSTEM" == "CLANGARM64" ]];
+    export ARTIFACTS_SUFFIX="-arm64"
+    export MSYS2_ARCH="clang-aarch64"
+    export BABL_OPTIONS=""
+    export GEGL_OPTIONS=""
+    export MSYS_PREFIX="/c/msys64/clangarm64/"
 fi

 # Update everything
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@ -7,10 +7,14 @@ if [[ "$MSYSTEM" == "MINGW32" ]]; then
    export MSYS2_ARCH="i686"
    export MSYS2_PREFIX="/c/msys64/mingw32"
    export GIMP_OPTIONS="-Dvala=disabled"
-else
+elif [[ "$MSYSTEM" == "MINGW64" ]]; then
    export ARTIFACTS_SUFFIX="-w64"
    export MSYS2_ARCH="x86_64"
    export MSYS2_PREFIX="/c/msys64/mingw64/"
+else # [[ "$MSYSTEM" == "CLANGARM64" ]];
+    export ARTIFACTS_SUFFIX="-arm64"
+    export MSYS2_ARCH="clang-aarch64"
+    export MSYS2_PREFIX="/c/msys64/clangarm64/"
 fi

 export ACLOCAL_FLAGS="-I${MSYS2_PREFIX}/share/aclocal"
@ -75,6 +79,7 @@ pacman --noconfirm -S --needed \
 # XXX We've got a weird error when the prefix is in the current dir.
 # Until we figure it out, this trick seems to work, even though it's
 # completely ridiculous.
+rm -fr ~/_install${ARTIFACTS_SUFFIX}
 mv "_install${ARTIFACTS_SUFFIX}" ~

 export GIMP_PREFIX="`realpath ~/_install`${ARTIFACTS_SUFFIX}"
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@ -8,12 +8,18 @@ if [[ "$MSYSTEM" == "MINGW32" ]]; then
    export MSYS_PREFIX="/c/msys64/mingw32/"
    export PATH="/mingw32/bin:$PATH"
    export GIMP_DISTRIB=`realpath ./gimp-w32`
-else
+elif [[ "$MSYSTEM" == "MINGW64" ]]; then
    export ARTIFACTS_SUFFIX="-w64"
    export MSYS2_ARCH="x86_64"
    export MSYS_PREFIX="/c/msys64/mingw64/"
    export PATH="/mingw64/bin:$PATH"
    export GIMP_DISTRIB=`realpath ./gimp-w64`
+else # [[ "$MSYSTEM" == "CLANGARM64" ]];
+    export ARTIFACTS_SUFFIX="-arm64"
+    export MSYS2_ARCH="clang-aarch64"
+    export MSYS_PREFIX="/c/msys64/clangarm64/"
+    export PATH="/clangarm64/bin:$PATH"
+    export GIMP_DISTRIB=`realpath ./gimp-arm64`
 fi

 # Update everything