[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/binary-factory-tooling] craft/pipeline-templates: Don't manually sign
From:       Hannah von Reth <null () kde ! org>
Date:       2018-04-10 10:19:06
Message-ID: E1f5qMk-0001tA-Kb () code ! kde ! org
[Download RAW message or body]

Git commit c044c7d844944ef17fb9400f49b8dd40e87e15cb by Hannah von Reth.
Committed on 10/04/2018 at 10:19.
Pushed by vonreth into branch 'master'.

Don't manually sign

M  +2    -5    craft/pipeline-templates/mingw64.pipeline
M  +2    -5    craft/pipeline-templates/win32.pipeline
M  +2    -5    craft/pipeline-templates/win64.pipeline

https://commits.kde.org/sysadmin/binary-factory-tooling/c044c7d844944ef17fb9400f49b8dd40e87e15cb


diff --git a/craft/pipeline-templates/mingw64.pipeline \
b/craft/pipeline-templates/mingw64.pipeline index 9cc3402..8848083 100644
--- a/craft/pipeline-templates/mingw64.pipeline
+++ b/craft/pipeline-templates/mingw64.pipeline
@@ -89,20 +89,17 @@ timestamps {
 				if errorlevel 1 exit /b %errorlevel%
 			"""
 
-			// Then sign that installer and copy it to the Jenkins workspace so it can be \
grabbed from there +			// Copy it to the Jenkins workspace so it can be grabbed from \
there  bat """
 				cd "C:\\Craft\\BinaryFactory\\"
 				for /f %%i in ('python "craftmaster/Craftmaster.py" --config \
"craftmaster/config/CraftBinaryCache.ini" --target ${craftPlatform} -c -q --get \
"packageDestinationDir()" virtual/base') do set CRAFT_TMPDIR=%%i  
-				python craftmaster/Craftmaster.py --config \
craftmaster/config/CraftBinaryCache.ini --target windows-msvc2017_64-cl -c --run \
signtool.exe sign /v /n "K Desktop Environment e.V." /tr \
                "http://timestamp.digicert.com" /td SHA256 /fd SHA256 /a \
                %CRAFT_TMPDIR%\\*.exe
-				if errorlevel 1 exit /b %errorlevel%
-
 				xcopy /y %CRAFT_TMPDIR%\\* %WORKSPACE%
 				del /Q %CRAFT_TMPDIR%\\*
 			"""
 		}
 
-		stage('Capturing Package') {		
+		stage('Capturing Package') {
 			// Then we ask Jenkins to capture the generated installers as an artifact
 			archiveArtifacts artifacts: '*.exe, *.7z, *.sha256', onlyIfSuccessful: true
 		}
diff --git a/craft/pipeline-templates/win32.pipeline \
b/craft/pipeline-templates/win32.pipeline index afa4534..042866b 100644
--- a/craft/pipeline-templates/win32.pipeline
+++ b/craft/pipeline-templates/win32.pipeline
@@ -89,20 +89,17 @@ timestamps {
 				if errorlevel 1 exit /b %errorlevel%
 			"""
 
-			// Then sign that installer and copy it to the Jenkins workspace so it can be \
grabbed from there +			// Copy it to the Jenkins workspace so it can be grabbed from \
there  bat """
 				cd "C:\\Craft\\BinaryFactory\\"
 				for /f %%i in ('python "craftmaster/Craftmaster.py" --config \
"craftmaster/config/CraftBinaryCache.ini" --target ${craftPlatform} -c -q --get \
"packageDestinationDir()" virtual/base') do set CRAFT_TMPDIR=%%i  
-				python craftmaster/Craftmaster.py --config \
craftmaster/config/CraftBinaryCache.ini --target ${craftPlatform} -c --run \
signtool.exe sign /v /n "K Desktop Environment e.V." /tr \
                "http://timestamp.digicert.com" /td SHA256 /fd SHA256 /a \
                %CRAFT_TMPDIR%\\*.exe
-				if errorlevel 1 exit /b %errorlevel%
-
 				xcopy /y %CRAFT_TMPDIR%\\* %WORKSPACE%
 				del /Q %CRAFT_TMPDIR%\\*
 			"""
 		}
 
-		stage('Capturing Package') {		
+		stage('Capturing Package') {
 			// Then we ask Jenkins to capture the generated installers as an artifact
 			archiveArtifacts artifacts: '*.exe, *.7z, *.sha256', onlyIfSuccessful: true
 		}
diff --git a/craft/pipeline-templates/win64.pipeline \
b/craft/pipeline-templates/win64.pipeline index 35418b3..4f8b5fb 100644
--- a/craft/pipeline-templates/win64.pipeline
+++ b/craft/pipeline-templates/win64.pipeline
@@ -89,20 +89,17 @@ timestamps {
 				if errorlevel 1 exit /b %errorlevel%
 			"""
 
-			// Then sign that installer and copy it to the Jenkins workspace so it can be \
grabbed from there +			// Copy it to the Jenkins workspace so it can be grabbed from \
there  bat """
 				cd "C:\\Craft\\BinaryFactory\\"
 				for /f %%i in ('python "craftmaster/Craftmaster.py" --config \
"craftmaster/config/CraftBinaryCache.ini" --target ${craftPlatform} -c -q --get \
"packageDestinationDir()" virtual/base') do set CRAFT_TMPDIR=%%i  
-				python craftmaster/Craftmaster.py --config \
craftmaster/config/CraftBinaryCache.ini --target ${craftPlatform} -c --run \
signtool.exe sign /v /n "K Desktop Environment e.V." /tr \
                "http://timestamp.digicert.com" /td SHA256 /fd SHA256 /a \
                %CRAFT_TMPDIR%\\*.exe
-				if errorlevel 1 exit /b %errorlevel%
-
 				xcopy /y %CRAFT_TMPDIR%\\* %WORKSPACE%
 				del /Q %CRAFT_TMPDIR%\\*
 			"""
 		}
 
-		stage('Capturing Package') {		
+		stage('Capturing Package') {
 			// Then we ask Jenkins to capture the generated installers as an artifact
 			archiveArtifacts artifacts: '*.exe, *.7z, *.sha256', onlyIfSuccessful: true
 		}


[prev in list] [next in list] [prev in thread] [next in thread]