mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Always sign MacOS packages. Leave only windows package signing under a checkbox.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
f7aa91c29e
commit
e3ca4bfb19
4 changed files with 12 additions and 8 deletions
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
|
@ -558,7 +558,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
environment: nightly
|
||||
sign-packages: false
|
||||
sign-packages: true
|
||||
secrets: inherit
|
||||
|
||||
amazonlinux-2-pkg-tests:
|
||||
|
|
8
.github/workflows/staging.yml
vendored
8
.github/workflows/staging.yml
vendored
|
@ -14,10 +14,10 @@ on:
|
|||
description: >
|
||||
The Salt version to set prior to building packages and staging the release.
|
||||
(DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0).
|
||||
sign-packages:
|
||||
sign-windows-packages:
|
||||
type: boolean
|
||||
default: false
|
||||
description: Sign Windows and MacOS Packages
|
||||
description: Sign Windows Packages
|
||||
skip-salt-test-suite:
|
||||
type: boolean
|
||||
default: false
|
||||
|
@ -541,7 +541,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
environment: staging
|
||||
sign-packages: ${{ inputs.sign-packages }}
|
||||
sign-packages: ${{ inputs.sign-windows-packages }}
|
||||
secrets: inherit
|
||||
|
||||
build-macos-pkgs:
|
||||
|
@ -554,7 +554,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
environment: staging
|
||||
sign-packages: ${{ inputs.sign-packages }}
|
||||
sign-packages: true
|
||||
secrets: inherit
|
||||
|
||||
amazonlinux-2-pkg-tests:
|
||||
|
|
|
@ -18,7 +18,11 @@
|
|||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
<%- if pkg_type in ("macos", "windows") and gh_environment %>
|
||||
environment: <{ gh_environment }>
|
||||
sign-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-packages }} <%- endif %>
|
||||
<%- if pkg_type == "macos" %>
|
||||
sign-packages: true
|
||||
<%- else %>
|
||||
sign-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>
|
||||
<%- endif %>
|
||||
secrets: inherit
|
||||
<%- endif %>
|
||||
|
||||
|
|
|
@ -27,10 +27,10 @@ on:
|
|||
description: >
|
||||
The Salt version to set prior to building packages and staging the release.
|
||||
(DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0).
|
||||
sign-packages:
|
||||
sign-windows-packages:
|
||||
type: boolean
|
||||
default: false
|
||||
description: Sign Windows and MacOS Packages
|
||||
description: Sign Windows Packages
|
||||
skip-salt-test-suite:
|
||||
type: boolean
|
||||
default: false
|
||||
|
|
Loading…
Add table
Reference in a new issue