mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-10-05 21:02:42 +02:00
gitlab-ci, build/windows: Remove forgotten comment about fixed #12284
This commit is contained in:
@@ -541,7 +541,6 @@ gimp-snap:
|
|||||||
PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
|
PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
|
||||||
before_script:
|
before_script:
|
||||||
- if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
|
- 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"
|
- $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX"
|
||||||
timeout: 30m
|
timeout: 30m
|
||||||
|
|
||||||
|
@@ -32,7 +32,6 @@ if ($GITLAB_CI)
|
|||||||
# Prepare env
|
# Prepare env
|
||||||
if (-not $GIMP_PREFIX)
|
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"
|
$GIMP_PREFIX = "$PWD\..\_install"
|
||||||
}
|
}
|
||||||
Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')
|
Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')
|
||||||
|
Reference in New Issue
Block a user