Store the gpg key ID in a variable on the layout.yml.jinja template

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-02-28 13:22:25 +00:00 committed by Pedro Algarvio
parent a61990d325
commit 1813c34c47
8 changed files with 10 additions and 9 deletions

View file

@ -80,7 +80,7 @@
- name: Create Repository
run: |
tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create deb --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -46,7 +46,7 @@
- name: Create Repository
run: |
tools pkg repo create macos --key-id=64CBBC8173D76B3F <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create macos --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -82,7 +82,7 @@
- name: Create Repository
run: |
tools pkg repo create onedir --key-id=64CBBC8173D76B3F <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create onedir --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -77,7 +77,7 @@
- name: Create Repository
run: |
tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create rpm --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -46,7 +46,7 @@
- name: Create Repository
run: |
tools pkg repo create src --key-id=64CBBC8173D76B3F <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create src --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -64,7 +64,7 @@
- name: Create Repository
run: |
tools pkg repo create windows --key-id=64CBBC8173D76B3F <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
tools pkg repo create windows --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build <%- endif %> \
--salt-version=${{ needs.prepare-workflow.outputs.salt-version }} ${{ contains(needs.prepare-workflow.outputs.salt-version, 'rc') && '--rc-build' || '' }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

View file

@ -7,6 +7,7 @@
<%- set python_version_macos = "3.10.10" %>
<%- set python_version_windows = "3.10.10" %>
<%- set relenv_version = "0.7.0" %>
<%- set gpg_key_id = "64CBBC8173D76B3F" %>
<%- set prepare_actual_release = prepare_actual_release | default(False) %>
---
name: <{ workflow_name }>

View file

@ -157,7 +157,7 @@ permissions:
- name: Publish Release Repository
run: |
tools pkg repo publish release --key-id=64CBBC8173D76B3F ${{ needs.prepare-workflow.outputs.salt-version }}
tools pkg repo publish release --key-id=<{ gpg_key_id }> ${{ needs.prepare-workflow.outputs.salt-version }}
<%- if includes.get("test-pkg-uploads", True) %>
<%- include "test-pkg-repo-uploads.yml.jinja" %>
@ -220,7 +220,7 @@ permissions:
- name: Prepare Release
id: prepare-release
run: |
tools pkg repo publish github --repository ${{ github.repository }} --key-id=64CBBC8173D76B3F ${{ needs.prepare-workflow.outputs.salt-version }}
tools pkg repo publish github --repository ${{ github.repository }} --key-id=<{ gpg_key_id }> ${{ needs.prepare-workflow.outputs.salt-version }}
- name: Configure Git
shell: bash
@ -228,7 +228,7 @@ permissions:
git config --global --add safe.directory "$(pwd)"
git config --global user.name "Salt Project Packaging"
git config --global user.email saltproject-packaging@vmware.com
git config --global user.signingkey 64CBBC8173D76B3F
git config --global user.signingkey <{ gpg_key_id }>
git config --global commit.gpgsign true
- name: Apply The Release Patch