diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1adee669eb..9004357d08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -541,7 +541,6 @@ gimp-snap: PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true' before_script: - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }} - # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284 - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX" timeout: 30m diff --git a/build/windows/2_build-gimp-msys2.ps1 b/build/windows/2_build-gimp-msys2.ps1 index 6a39dc363d..8d69b3b973 100644 --- a/build/windows/2_build-gimp-msys2.ps1 +++ b/build/windows/2_build-gimp-msys2.ps1 @@ -32,7 +32,6 @@ if ($GITLAB_CI) # Prepare env if (-not $GIMP_PREFIX) { - #FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284 $GIMP_PREFIX = "$PWD\..\_install" } Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')