From 1f24aa5f7cbd287b55f11e82a2c208ec378509b5 Mon Sep 17 00:00:00 2001 From: Bruno Date: Tue, 6 Aug 2024 08:47:55 -0300 Subject: [PATCH] build/windows: Move splitting script to its right dir Following 0199faac and 884b05f1 It's clearer than ever that this is an installer-only thing so let's move the script to the right place. --- .gitlab-ci.yml | 5 +++-- .../3_dist-gimp-inno_sym.sh} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename build/windows/{2_bundle-gimp-uni_sym.sh => installer/3_dist-gimp-inno_sym.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f81017ca4d..3833762382d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -572,7 +572,8 @@ gimp-win-x86: stage: gimp script: - C:\msys64\usr\bin\bash -lc "bash build/windows/2_build-gimp-msys2.sh" - - C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_sym.sh" + # We split 32-bit DWARF symbols here because LLVM-objcopy do NOT support them + - C:\msys64\usr\bin\bash -lc "bash build/windows/installer/3_dist-gimp-inno_sym.sh" artifacts: paths: - gimp-x86/ @@ -776,7 +777,7 @@ dist-installer-weekly: MSYSTEM: "CLANGARM64" cache: [] script: - - C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_sym.sh" + - C:\msys64\usr\bin\bash -lc "bash build/windows/installer/3_dist-gimp-inno_sym.sh" - build/windows/installer/3_dist-gimp-inno.ps1 | Out-File -FilePath installer.log artifacts: expose_as: 'Windows exe' diff --git a/build/windows/2_bundle-gimp-uni_sym.sh b/build/windows/installer/3_dist-gimp-inno_sym.sh similarity index 100% rename from build/windows/2_bundle-gimp-uni_sym.sh rename to build/windows/installer/3_dist-gimp-inno_sym.sh -- GitLab