From 34748af7a7dcf94ad868c2acf6edb221d9732397 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 1 Aug 2021 14:43:51 +0200 Subject: [PATCH] gitlab-ci, build: compute the checksums of installer in bash script. I completely forgot that since the installer is built on a Windows runner, I cannot expect a standard Linux shell syntax. As a consequence, commit de9a171a19 broke the "win-installer-nightly" job with the following error: > The token '&&' is not a valid statement separator in this version. Rather than trying to find the equivalent command to run on powershell or whatever, let's just compute the checksum at the end of our installer creation script. --- .gitlab-ci.yml | 4 ---- build/windows/gitlab-ci/installer-gimp-msys2.sh | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96af8c7df8..eab62d4a09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -690,10 +690,6 @@ win-installer-nightly: script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/installer-gimp-msys2.sh > installer.log 2>&1" - - cd build/windows/installer/_Output - - FILENAME=`ls gimp-*.exe` && - sha256sum gimp-*.exe > ${FILENAME}.SHA256SUMS && - sha512sum gimp-*.exe > ${FILENAME}.SHA512SUMS needs: ["packaging-win32-native", "packaging-win64-native"] sources: diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh index b69bff73ac..87dd280d3a 100644 --- a/build/windows/gitlab-ci/installer-gimp-msys2.sh +++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh @@ -39,6 +39,10 @@ cd build/windows/installer # Test if the installer was created and return success/failure. if [ -f "_Output/gimp-${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}-setup.exe" ]; then + cd _Output/ + INSTALLER="gimp-${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}-setup.exe" + sha256sum $INSTALLER > ${INSTALLER}.SHA256SUMS + sha512sum $INSTALLER > ${INSTALLER}.SHA512SUMS exit 0 else exit 1