This commit is contained in:
Eugene 2024-12-19 01:27:36 +01:00
parent 0a1e4b177e
commit 0377974074
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
2 changed files with 5 additions and 5 deletions

View File

@ -314,7 +314,7 @@ jobs:
- name: Code signing with Software Trust Manager - name: Code signing with Software Trust Manager
uses: digicert/ssm-code-signing@v1.0.0 uses: digicert/ssm-code-signing@v1.0.0
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/signingtest' || startsWith(github.ref, 'refs/tags')) if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref_protected || startsWith(github.ref, 'refs/tags'))
- name: Installing Node - name: Installing Node
uses: actions/setup-node@v3.7.0 uses: actions/setup-node@v3.7.0
@ -351,7 +351,7 @@ jobs:
$env:WIN_CSC_LINK=$env:CERT_TEMP_PATH $env:WIN_CSC_LINK=$env:CERT_TEMP_PATH
$env:WIN_CSC_KEY_PASSWORD=$env:SM_CLIENT_CERT_PASSWORD $env:WIN_CSC_KEY_PASSWORD=$env:SM_CLIENT_CERT_PASSWORD
node scripts/build-windows.mjs node scripts/build-windows.mjs
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/signingtest' || startsWith(github.ref, 'refs/tags')) if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref_protected || startsWith(github.ref, 'refs/tags'))
env: env:
ARCH: ${{matrix.arch}} ARCH: ${{matrix.arch}}
CERT_TEMP_PATH: Certificate_pkcs12.p12 CERT_TEMP_PATH: Certificate_pkcs12.p12
@ -368,7 +368,7 @@ jobs:
- name: Build packages without signing - name: Build packages without signing
run: node scripts/build-windows.mjs run: node scripts/build-windows.mjs
if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))" if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref_protected || startsWith(github.ref, 'refs/tags')))"
env: env:
ARCH: ${{matrix.arch}} ARCH: ${{matrix.arch}}

View File

@ -28,7 +28,7 @@ builder({
certificateSha1: process.env.SM_CODE_SIGNING_CERT_SHA1_HASH, certificateSha1: process.env.SM_CODE_SIGNING_CERT_SHA1_HASH,
publisherName: process.env.SM_PUBLISHER_NAME, publisherName: process.env.SM_PUBLISHER_NAME,
signingHashAlgorithms: ['sha256'], signingHashAlgorithms: ['sha256'],
sign: async function (configuration) { sign: keypair ? async function (configuration) {
if (configuration.path) { if (configuration.path) {
execSync( execSync(
`smctl sign --keypair-alias=${keypair} --input "${String(configuration.path)}"`, { `smctl sign --keypair-alias=${keypair} --input "${String(configuration.path)}"`, {
@ -36,7 +36,7 @@ builder({
} }
) )
} }
} } : undefined,
}, },
}, },