Commit 78179c30 authored by Ben Cooksley's avatar Ben Cooksley

Update the release pipelines for Krita to not be broken due to changes in the...

Update the release pipelines for Krita to not be broken due to changes in the Jenkins security sandbox model
parent 91eb1c28
......@@ -8,6 +8,11 @@ def buildParameters = input(
]
)
// Pull the version we've been given out to a separate variable
// We need to do this otherwise Jenkins will throw it's toys and claim we are violating a security sandbox which will expose our instance to vulnerabilites
// The Jenkins Security Sandbox is IMO broken and faulty in this regard
def buildVersion = buildParameters.Version ?: ''
// Request a node to be allocated to us
node( "Appimage1604" ) {
// We want Timestamps on everything
......@@ -21,11 +26,11 @@ timestamps {
// Now we download the release tarball, unpack it and rename the directory to something more convenient to use everywhere else
sh """
wget "https://origin.files.kde.org/krita/.release/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
wget "https://origin.files.kde.org/krita/.release/${buildVersion}/krita-${buildVersion}.tar.gz"
tar -xf "$WORKSPACE/krita-${buildParameters['Version']}.tar.gz"
tar -xf "$WORKSPACE/krita-${buildVersion}.tar.gz"
mv krita-${buildParameters['Version']} krita
mv krita-${buildVersion} krita
"""
}
......
......@@ -7,6 +7,11 @@ def buildParameters = input(
]
)
// Pull the version we've been given out to a separate variable
// We need to do this otherwise Jenkins will throw it's toys and claim we are violating a security sandbox which will expose our instance to vulnerabilites
// The Jenkins Security Sandbox is IMO broken and faulty in this regard
def buildVersion = buildParameters.Version ?: ''
// Request a node to be allocated to us
node( "macOS" ) {
// We want Timestamps on everything
......@@ -21,11 +26,11 @@ timestamps {
// Now we download the release tarball, unpack it and rename the directory to something more convenient to use everywhere else
bat """
wget "https://origin.files.kde.org/krita/.release/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
wget "https://origin.files.kde.org/krita/.release/${buildVersion}/krita-${buildVersion}.tar.gz"
tar -xf "\$WORKSPACE/krita-${buildParameters['Version']}.tar.gz"
tar -xf "\$WORKSPACE/krita-${buildVersion}.tar.gz"
mv krita-${buildParameters['Version']} krita
mv krita-${buildVersion} krita
"""
}
......
......@@ -7,6 +7,11 @@ def buildParameters = input(
]
)
// Pull the version we've been given out to a separate variable
// We need to do this otherwise Jenkins will throw it's toys and claim we are violating a security sandbox which will expose our instance to vulnerabilites
// The Jenkins Security Sandbox is IMO broken and faulty in this regard
def buildVersion = buildParameters.Version ?: ''
// Request a node to be allocated to us
node( "WindowsMingw" ) {
// We want Timestamps on everything
......@@ -24,12 +29,12 @@ timestamps {
set PATH=C:/MingW/i686-7.3.0-posix-dwarf-rt_v5-rev0/mingw32/bin;C:/PROGRA~2/Python38-32/;C:/Craft/Krita/windows-msvc2019_64-cl/bin/;C:/Craft/Krita/windows-msvc2019_64-cl/dev-utils/bin/;%PATH%
set CA_CERT_BUNDLE=C:/Craft/Krita/windows-msvc2019_64-cl/etc/cacert.pem
wget --ca-certificate %CA_CERT_BUNDLE% "https://origin.files.kde.org/krita/.release/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
wget --ca-certificate %CA_CERT_BUNDLE% "https://origin.files.kde.org/krita/.release/${buildVersion}/krita-${buildVersion}.tar.gz"
7za x "%WORKSPACE%/krita-${buildParameters['Version']}.tar.gz"
7za x "%WORKSPACE%/krita-${buildParameters['Version']}.tar"
7za x "%WORKSPACE%/krita-${buildVersion}.tar.gz"
7za x "%WORKSPACE%/krita-${buildVersion}.tar"
ren krita-${buildParameters['Version']} krita
ren krita-${buildVersion} krita
"""
}
......@@ -66,7 +71,7 @@ timestamps {
set SIGNTOOL_SIGN_FLAGS=/v /n "K Desktop Environment e.V." /tr "http://timestamp.digicert.com" /td SHA256 /fd SHA256
cmd /c krita\\packaging\\windows\\package-complete.cmd --no-interactive --src-dir "%WORKSPACE%\\krita" --deps-install-dir "C:\\Packaging\\KritaWS\\deps-install" --krita-install-dir "C:\\Packaging\\KritaWS\\krita-install" --pre-zip-hook "%WORKSPACE%\\krita\\packaging\\windows\\sign-package.cmd" --package-name "krita-x86-${buildParameters['Version']}"
cmd /c krita\\packaging\\windows\\package-complete.cmd --no-interactive --src-dir "%WORKSPACE%\\krita" --deps-install-dir "C:\\Packaging\\KritaWS\\deps-install" --krita-install-dir "C:\\Packaging\\KritaWS\\krita-install" --pre-zip-hook "%WORKSPACE%\\krita\\packaging\\windows\\sign-package.cmd" --package-name "krita-x86-${buildVersion}"
if errorlevel 1 exit /b %errorlevel%
"""
......@@ -76,7 +81,7 @@ timestamps {
// Let's build an installer!
bat """
set PATH=C:/MingW/i686-7.3.0-posix-dwarf-rt_v5-rev0/mingw32/bin;C:/PROGRA~2/Python38-32/;C:/Craft/Krita/windows-msvc2019_64-cl/bin/;C:/Craft/Krita/windows-msvc2019_64-cl/dev-utils/bin/;%PATH%
set PACKAGE_NAME=krita-x86-${buildParameters['Version']}
set PACKAGE_NAME=krita-x86-${buildVersion}
cd C:\\Packaging\\KritaWS
mkdir installer
......
......@@ -7,6 +7,11 @@ def buildParameters = input(
]
)
// Pull the version we've been given out to a separate variable
// We need to do this otherwise Jenkins will throw it's toys and claim we are violating a security sandbox which will expose our instance to vulnerabilites
// The Jenkins Security Sandbox is IMO broken and faulty in this regard
def buildVersion = buildParameters.Version ?: ''
// Request a node to be allocated to us
node( "WindowsMingw" ) {
// We want Timestamps on everything
......@@ -24,12 +29,12 @@ timestamps {
set PATH=C:/MingW/x86_64-7.3.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/windows-msvc2019_64-cl/bin/;C:/Craft/Krita/windows-msvc2019_64-cl/dev-utils/bin/;%PATH%
set CA_CERT_BUNDLE=C:/Craft/Krita/windows-msvc2019_64-cl/etc/cacert.pem
wget --ca-certificate %CA_CERT_BUNDLE% "https://origin.files.kde.org/krita/.release/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
wget --ca-certificate %CA_CERT_BUNDLE% "https://origin.files.kde.org/krita/.release/${buildVersion}/krita-${buildVersion}.tar.gz"
7za x "%WORKSPACE%/krita-${buildParameters['Version']}.tar.gz"
7za x "%WORKSPACE%/krita-${buildParameters['Version']}.tar"
7za x "%WORKSPACE%/krita-${buildVersion}.tar.gz"
7za x "%WORKSPACE%/krita-${buildVersion}.tar"
ren krita-${buildParameters['Version']} krita
ren krita-${buildVersion} krita
"""
}
......@@ -65,7 +70,7 @@ timestamps {
set SIGNTOOL_SIGN_FLAGS=/v /n "K Desktop Environment e.V." /tr "http://timestamp.digicert.com" /td SHA256 /fd SHA256
cmd /c krita\\packaging\\windows\\package-complete.cmd --no-interactive --src-dir "%WORKSPACE%\\krita" --deps-install-dir "C:\\Packaging\\KritaWS\\deps-install" --krita-install-dir "C:\\Packaging\\KritaWS\\krita-install" --pre-zip-hook "%WORKSPACE%\\krita\\packaging\\windows\\sign-package.cmd" --package-name "krita-x64-${buildParameters['Version']}"
cmd /c krita\\packaging\\windows\\package-complete.cmd --no-interactive --src-dir "%WORKSPACE%\\krita" --deps-install-dir "C:\\Packaging\\KritaWS\\deps-install" --krita-install-dir "C:\\Packaging\\KritaWS\\krita-install" --pre-zip-hook "%WORKSPACE%\\krita\\packaging\\windows\\sign-package.cmd" --package-name "krita-x64-${buildVersion}"
if errorlevel 1 exit /b %errorlevel%
"""
......@@ -75,7 +80,7 @@ timestamps {
// Let's build an installer!
bat """
set PATH=C:/MingW/x86_64-7.3.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/windows-msvc2019_64-cl/bin/;C:/Craft/Krita/windows-msvc2019_64-cl/dev-utils/bin/;%PATH%
set PACKAGE_NAME=krita-x64-${buildParameters['Version']}
set PACKAGE_NAME=krita-x64-${buildVersion}
cd C:\\Packaging\\KritaWS
mkdir installer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment