diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c2c7fa113ca8d01a2998c852a45c8cd95ecd676..85d5c8529f45d4bb569c355f7010c4050d1730a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,14 +188,14 @@ inkscape:macos: variables: MSYSTEM: UCRT64 CCACHE_DIR: $CI_PROJECT_DIR/ccache - CCACHE_MAXSIZE: "1.0G" + CCACHE_MAXSIZE: "500M" # IDW = Inkscape Deps Windows, https://gitlab.com/inkscape/deps/windows - IDW_VERSION: 69 + IDW_VERSION: 115 IDW_NAME: ink$IDW_VERSION - IDW_RELEASE_URL: $CI_API_V4_URL/projects/46863172/packages/generic/windows/r$IDW_VERSION/$IDW_NAME.7z + IDW_RELEASE_URL: $CI_API_V4_URL/projects/46863172/packages/generic/windows/r$IDW_VERSION/${IDW_NAME}_$MSYSTEM.7z before_script: - wget.exe --quiet --no-check-certificate $IDW_RELEASE_URL - - 7z x -oC:/ "$Env:IDW_NAME.7z" + - 7z x -oC:/ "${Env:IDW_NAME}_${Env:MSYSTEM}.7z" inkscape:windows: diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 62e6a2de6de9f5c89cb341ee0f7b3a8f308ff54f..e24a8af2f571a2feb8255d06df2ece96bcbdb624 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -73,7 +73,8 @@ $ARCH-gtkmm4 # install packaging tools (required for dist-win-* targets) eval pacman -S $PACMAN_OPTIONS \ $ARCH-7zip \ -$ARCH-nsis +$ARCH-nsis \ +$ARCH-ntldd # install Inkscape dependencies (optional) eval pacman -S $PACMAN_OPTIONS \