saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 01:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make pkg-repo a repo sub-command for pkg

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-02-07 11:37:08 +00:00 • committed by Pedro Algarvio
parent 54246055a8
commit 4270c816c4
11 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-deb-repo.yml vendored
View file

@ -126,7 +126,7 @@ jobs:
- name: Create Repository - name: Create Repository
run: | run: |
tools pkg-repo deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \
${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \
${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \
--incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo

2
.github/workflows/build-macos-repo.yml vendored
View file

@ -89,7 +89,7 @@ jobs:
- name: Create Repository - name: Create Repository
run: | run: |
tools pkg-repo macos --key-id=64CBBC8173D76B3F \ tools pkg repo create macos --key-id=64CBBC8173D76B3F \
${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \
${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \
--repo-path=artifacts/pkgs/repo --repo-path=artifacts/pkgs/repo

2
.github/workflows/build-onedir-repo.yml vendored
View file

@ -131,7 +131,7 @@ jobs:
- name: Create Repository - name: Create Repository
run: | run: |
tools pkg-repo onedir --key-id=64CBBC8173D76B3F \ tools pkg repo create onedir --key-id=64CBBC8173D76B3F \
${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \
${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \
--repo-path=artifacts/pkgs/repo --repo-path=artifacts/pkgs/repo

2
.github/workflows/build-rpm-repo.yml vendored
View file

@ -111,7 +111,7 @@ jobs:
- name: Create Repository - name: Create Repository
run: | run: |
tools pkg-repo rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \
${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \
${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} \
--distro-version=${{ matrix.version }} \ --distro-version=${{ matrix.version }} \

2
.github/workflows/build-windows-repo.yml vendored
View file

@ -95,7 +95,7 @@ jobs:
- name: Create Repository - name: Create Repository
run: | run: |
tools pkg-repo windows --key-id=64CBBC8173D76B3F \ tools pkg repo create windows --key-id=64CBBC8173D76B3F \
${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \
${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \
--repo-path=artifacts/pkgs/repo --repo-path=artifacts/pkgs/repo

2
.pre-commit-config.yaml
View file

@ -46,7 +46,7 @@ repos:
)$ )$
- repo: https://github.com/s0undt3ch/python-tools-scripts - repo: https://github.com/s0undt3ch/python-tools-scripts
rev: "0.10.1" rev: "0.10.2"
hooks: hooks:
- id: tools - id: tools
alias: generate-workflows alias: generate-workflows

2
requirements/static/ci/py3.10/tools.txt
View file

@ -30,7 +30,7 @@ pygments==2.13.0
# via rich # via rich
python-dateutil==2.8.2 python-dateutil==2.8.2
# via botocore # via botocore
python-tools-scripts==0.10.1 python-tools-scripts==0.10.2
# via -r requirements/static/ci/tools.in # via -r requirements/static/ci/tools.in
pyyaml==6.0 pyyaml==6.0
# via -r requirements/static/ci/tools.in # via -r requirements/static/ci/tools.in

2
requirements/static/ci/py3.9/tools.txt
View file

@ -30,7 +30,7 @@ pygments==2.13.0
# via rich # via rich
python-dateutil==2.8.2 python-dateutil==2.8.2
# via botocore # via botocore
python-tools-scripts==0.10.1 python-tools-scripts==0.10.2
# via -r requirements/static/ci/tools.in # via -r requirements/static/ci/tools.in
pyyaml==6.0 pyyaml==6.0
# via -r requirements/static/ci/tools.in # via -r requirements/static/ci/tools.in

2
requirements/static/ci/tools.in
View file

@ -1,4 +1,4 @@
python-tools-scripts >= 0.10.1 python-tools-scripts >= 0.10.2
attrs attrs
boto3 boto3
pyyaml pyyaml

10
tools/changelog.py
View file

@ -19,7 +19,7 @@ log = logging.getLogger(__name__)
REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
# Define the command group # Define the command group
cl = command_group( changelog = command_group(
name="changelog", name="changelog",
help="Changelog tools", help="Changelog tools",
description=__doc__, description=__doc__,
@ -118,7 +118,7 @@ def _get_salt_version():
) )
@cl.command( @changelog.command(
name="update-rpm", name="update-rpm",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -168,7 +168,7 @@ def update_rpm(ctx: Context, salt_version: str, draft: bool = False):
os.remove(tmpspec) os.remove(tmpspec)
@cl.command( @changelog.command(
name="update-deb", name="update-deb",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -211,7 +211,7 @@ def update_deb(ctx: Context, salt_version: str, draft: bool = False):
os.remove(tmpchanges) os.remove(tmpchanges)
@cl.command( @changelog.command(
name="update-release-notes", name="update-release-notes",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -257,7 +257,7 @@ def update_release_notes(ctx: Context, salt_version: str, draft: bool = False):
os.remove(tmpnotes) os.remove(tmpnotes)
@cl.command( @changelog.command(
name="update-changelog-md", name="update-changelog-md",
arguments={ arguments={
"salt_version": { "salt_version": {

23
tools/pkgrepo.py
View file

@ -16,17 +16,26 @@ from typing import TYPE_CHECKING
import packaging.version import packaging.version
from ptscripts import Context, command_group from ptscripts import Context, command_group
import tools.pkg
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
# Define the command group # Define the command group
pkg = command_group( repo = command_group(
name="pkg-repo", help="Packaging Repository Related Commands", description=__doc__ name="repo",
help="Packaging Repository Related Commands",
description=__doc__,
parent=tools.pkg.pkg,
)
create = command_group(
name="create", help="Packaging Repository Creation Related Commands", parent=repo
) )
@pkg.command( @create.command(
name="deb", name="deb",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -290,7 +299,7 @@ def debian(
ctx.info("Done") ctx.info("Done")
@pkg.command( @create.command(
name="rpm", name="rpm",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -503,7 +512,7 @@ def rpm(
ctx.info("Done") ctx.info("Done")
@pkg.command( @create.command(
name="windows", name="windows",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -564,7 +573,7 @@ def windows(
ctx.info("Done") ctx.info("Done")
@pkg.command( @create.command(
name="macos", name="macos",
arguments={ arguments={
"salt_version": { "salt_version": {
@ -625,7 +634,7 @@ def macos(
ctx.info("Done") ctx.info("Done")
@pkg.command( @create.command(
name="onedir", name="onedir",
arguments={ arguments={
"salt_version": { "salt_version": {