From c331e84bcf06ad08db54e4844c8f7cb331760a25 Mon Sep 17 00:00:00 2001 From: Vitalii Lysychenko Date: Wed, 21 Jan 2026 15:37:29 +0200 Subject: [PATCH 1/4] JGC-441 - Skip windows build --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b73a1b4d3..6f0c32843 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,8 @@ node("docker-ubuntu20-xlarge") { env.REPO_NAME_21="$repo21Name" } def architectures = [ - [pkg: 'jfrog-cli-windows-amd64', goos: 'windows', goarch: 'amd64', fileExtension: '.exe', chocoImage: '${REPO_NAME_21}/jfrog-docker/chocolatey/choco'], + // JGC-441 - skipping windows build due to signing issues + // [pkg: 'jfrog-cli-windows-amd64', goos: 'windows', goarch: 'amd64', fileExtension: '.exe', chocoImage: '${REPO_NAME_21}/jfrog-docker/chocolatey/choco'], [pkg: 'jfrog-cli-linux-386', goos: 'linux', goarch: '386', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/i386/ubuntu:20.04', debianArch: 'i386'], [pkg: 'jfrog-cli-linux-amd64', goos: 'linux', goarch: 'amd64', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/ubuntu:20.04', debianArch: 'x86_64', rpmImage: 'almalinux:8.10'], [pkg: 'jfrog-cli-linux-arm64', goos: 'linux', goarch: 'arm64', fileExtension: ''], From 029e640fee49f02d76131c8cd6e11464b2233d79 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Jan 2026 11:03:33 +0100 Subject: [PATCH 2/4] JGC-444 - Re-enable Windows build in Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f0c32843..08944d628 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ node("docker-ubuntu20-xlarge") { } def architectures = [ // JGC-441 - skipping windows build due to signing issues - // [pkg: 'jfrog-cli-windows-amd64', goos: 'windows', goarch: 'amd64', fileExtension: '.exe', chocoImage: '${REPO_NAME_21}/jfrog-docker/chocolatey/choco'], + [pkg: 'jfrog-cli-windows-amd64', goos: 'windows', goarch: 'amd64', fileExtension: '.exe', chocoImage: '${REPO_NAME_21}/jfrog-docker/chocolatey/choco'], [pkg: 'jfrog-cli-linux-386', goos: 'linux', goarch: '386', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/i386/ubuntu:20.04', debianArch: 'i386'], [pkg: 'jfrog-cli-linux-amd64', goos: 'linux', goarch: 'amd64', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/ubuntu:20.04', debianArch: 'x86_64', rpmImage: 'almalinux:8.10'], [pkg: 'jfrog-cli-linux-arm64', goos: 'linux', goarch: 'arm64', fileExtension: ''], From e0fa5ba856242193768c05942e7e35871e362ddf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Jan 2026 16:27:12 +0100 Subject: [PATCH 3/4] JGC-444 - Add debug logging display for Windows binary signing failures --- Jenkinsfile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08944d628..43497aad8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -448,7 +448,26 @@ def build(goos, goarch, pkg, fileName) { sh "mv ${jfrogCliRepoDir}${fileName} ${fileName}.unsigned" sh "docker build -t jfrog-cli-sign-tool ." // Run the built image in order to signs the JFrog CLI binary. - sh "docker run -v ${jfrogCliRepoDir}build/sign/:/home/frogger jfrog-cli-sign-tool -in ${fileName}.unsigned -out $fileName" + def signingExitCode = sh( + script: "docker run -v ${jfrogCliRepoDir}build/sign/:/home/frogger jfrog-cli-sign-tool -in ${fileName}.unsigned -out $fileName", + returnStatus: true + ) + if (signingExitCode != 0) { + echo "==========================================" + echo "Signing failed! Displaying smpkcs11.log:" + echo "==========================================" + sh """#!/bin/bash + if [ -f smpkcs11.log ]; then + cat smpkcs11.log + else + echo "Warning: smpkcs11.log file not found in current directory" + echo "Listing files in current directory:" + ls -la + fi + """ + echo "==========================================" + error "Signing failed with exit code ${signingExitCode}" + } // Move the JFrog CLI binary from the 'sign' directory, back to its original location. sh "mv $fileName $jfrogCliRepoDir" } From 66e9e7818603f9505b05c60c152ea67747fbc298 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Jan 2026 09:14:39 +0100 Subject: [PATCH 4/4] JGC-441 - Remove comment about skipping Windows build in Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43497aad8..30f026048 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,6 @@ node("docker-ubuntu20-xlarge") { env.REPO_NAME_21="$repo21Name" } def architectures = [ - // JGC-441 - skipping windows build due to signing issues [pkg: 'jfrog-cli-windows-amd64', goos: 'windows', goarch: 'amd64', fileExtension: '.exe', chocoImage: '${REPO_NAME_21}/jfrog-docker/chocolatey/choco'], [pkg: 'jfrog-cli-linux-386', goos: 'linux', goarch: '386', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/i386/ubuntu:20.04', debianArch: 'i386'], [pkg: 'jfrog-cli-linux-amd64', goos: 'linux', goarch: 'amd64', fileExtension: '', debianImage: '${REPO_NAME_21}/jfrog-docker/ubuntu:20.04', debianArch: 'x86_64', rpmImage: 'almalinux:8.10'],