mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Wider output
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
e4f4993fda
commit
e56d5d6a29
20 changed files with 19 additions and 226 deletions
2
.github/actions/build-onedir-deps/action.yml
vendored
2
.github/actions/build-onedir-deps/action.yml
vendored
|
@ -22,7 +22,7 @@ inputs:
|
|||
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
|
||||
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
|
||||
|
||||
|
|
2
.github/actions/build-onedir-salt/action.yml
vendored
2
.github/actions/build-onedir-salt/action.yml
vendored
|
@ -26,7 +26,7 @@ inputs:
|
|||
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
|
||||
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ inputs:
|
|||
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
|
||||
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ outputs:
|
|||
description: The Salt version written to `salt/_version.txt`
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
|
|
2
.github/workflows/build-deb-repo.yml
vendored
2
.github/workflows/build-deb-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/build-macos-repo.yml
vendored
2
.github/workflows/build-macos-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/build-onedir-repo.yml
vendored
2
.github/workflows/build-onedir-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/build-repos.yml
vendored
2
.github/workflows/build-repos.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-src:
|
||||
|
|
2
.github/workflows/build-rpm-packages.yml
vendored
2
.github/workflows/build-rpm-packages.yml
vendored
|
@ -10,7 +10,7 @@ on:
|
|||
description: The Salt version to set prior to building packages.
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
|
2
.github/workflows/build-rpm-repo.yml
vendored
2
.github/workflows/build-rpm-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/build-src-repo.yml
vendored
2
.github/workflows/build-src-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/build-windows-repo.yml
vendored
2
.github/workflows/build-windows-repo.yml
vendored
|
@ -22,7 +22,7 @@ on:
|
|||
required: true
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
build-repo:
|
||||
|
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -7,7 +7,7 @@ on:
|
|||
pull_request: {}
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
|
|
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
|
@ -9,7 +9,7 @@ on:
|
|||
- cron: '0 3 * * *' # Every day at 3AM
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
|
|
2
.github/workflows/publish-repositories.yml
vendored
2
.github/workflows/publish-repositories.yml
vendored
|
@ -13,7 +13,7 @@ on:
|
|||
description: The Salt version
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
|
||||
jobs:
|
||||
|
||||
|
|
207
.github/workflows/release.yml
vendored
207
.github/workflows/release.yml
vendored
|
@ -1,207 +0,0 @@
|
|||
---
|
||||
name: Generate Release Docs
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
saltVersion:
|
||||
description: 'Salt Version'
|
||||
required: true
|
||||
manPages:
|
||||
description: "Build Man Pages"
|
||||
default: true
|
||||
required: false
|
||||
branch:
|
||||
description: "Branch to build/push PR"
|
||||
default: "master"
|
||||
required: false
|
||||
|
||||
|
||||
env:
|
||||
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
|
||||
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
|
||||
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
SaltChangelog:
|
||||
permissions:
|
||||
contents: read # for dorny/paths-filter to fetch a list of changed files
|
||||
pull-requests: read # for dorny/paths-filter to read pull requests
|
||||
name: Build Salt Changelog
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
container:
|
||||
image: python:3.8-slim-buster
|
||||
|
||||
steps:
|
||||
|
||||
- name: Install System Deps
|
||||
run: |
|
||||
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
|
||||
apt-get update
|
||||
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
|
||||
apt-get install -y git/buster-backports
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.branch }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Install Nox
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install nox
|
||||
|
||||
- id: changed-files
|
||||
name: Get Changed Files
|
||||
uses: dorny/paths-filter@v2
|
||||
with:
|
||||
token: ${{ github.token }}
|
||||
list-files: json
|
||||
filters: |
|
||||
docs:
|
||||
- doc/**
|
||||
|
||||
- name: Install Python Requirements
|
||||
run: |
|
||||
nox --install-only --forcecolor -e 'changelog(force=True, draft=False)' -- ${{ github.event.inputs.saltVersion }}
|
||||
nox --install-only --forcecolor -e 'changelog(force=False, draft=True)' -- ${{ github.event.inputs.saltVersion }}
|
||||
|
||||
- name: Build Changelog
|
||||
env:
|
||||
SKIP_REQUIREMENTS_INSTALL: YES
|
||||
run: |
|
||||
nox --forcecolor -e 'changelog(force=False, draft=True)' -- ${{ github.event.inputs.saltVersion }} > rn_changelog
|
||||
nox --forcecolor -e 'changelog(force=True, draft=False)' -- ${{ github.event.inputs.saltVersion }}
|
||||
git restore --staged changelog/
|
||||
git diff --no-color > rm_changelog_patch.txt
|
||||
|
||||
- name: Store Generated Changelog
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: salt-changelog
|
||||
path: |
|
||||
CHANGELOG.md
|
||||
rm_changelog_patch.txt
|
||||
rn_changelog
|
||||
|
||||
Manpages:
|
||||
permissions:
|
||||
contents: read # for dorny/paths-filter to fetch a list of changed files
|
||||
pull-requests: read # for dorny/paths-filter to read pull requests
|
||||
name: Build Salt man Pages
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
container:
|
||||
image: python:3.8-slim-buster
|
||||
|
||||
steps:
|
||||
|
||||
- name: Install System Deps
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
run: |
|
||||
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
|
||||
apt-get update
|
||||
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
|
||||
apt-get install -y git/buster-backports
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.branch }}
|
||||
|
||||
|
||||
- id: changed-files
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
name: Get Changed Files
|
||||
uses: dorny/paths-filter@v2
|
||||
with:
|
||||
token: ${{ github.token }}
|
||||
list-files: json
|
||||
filters: |
|
||||
docs:
|
||||
- doc/**
|
||||
|
||||
- name: Install Nox
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install nox
|
||||
|
||||
- name: Install Python Requirements
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
run:
|
||||
nox --install-only --forcecolor -e 'docs-man(compress=False, update=True, clean=True)'
|
||||
|
||||
- name: Build Manpages
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
env:
|
||||
SKIP_REQUIREMENTS_INSTALL: YES
|
||||
run: |
|
||||
nox --forcecolor -e 'docs-man(compress=False, update=True, clean=True)'
|
||||
|
||||
- name: Store Generated Documentation
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: salt-man-pages
|
||||
path: doc/_build/man
|
||||
|
||||
PullRequest:
|
||||
permissions:
|
||||
contents: write # for peter-evans/create-pull-request to create branch
|
||||
pull-requests: write # for peter-evans/create-pull-request to create a PR
|
||||
needs: [SaltChangelog, Manpages]
|
||||
name: Create Pull Request
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
container:
|
||||
image: python:3.8-slim-buster
|
||||
|
||||
steps:
|
||||
- name: Install System Deps
|
||||
run: |
|
||||
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
|
||||
apt-get update
|
||||
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
|
||||
apt-get install -y git/buster-backports
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.branch }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Download salt-man-pages
|
||||
if: github.event.inputs.manPages == 'true'
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: salt-man-pages
|
||||
path: doc/man/
|
||||
|
||||
- name: Download salt changelog
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: salt-changelog
|
||||
|
||||
- name: Generate Release Notes and changelog
|
||||
run: |
|
||||
git apply rm_changelog_patch.txt
|
||||
rm rm_changelog_patch.txt
|
||||
sed -i '0,/^======/d' rn_changelog
|
||||
cat rn_changelog
|
||||
cat rn_changelog >> doc/topics/releases/${{ github.event.inputs.saltVersion }}.rst
|
||||
rm rn_changelog
|
||||
|
||||
- name: Create Pull Request for Release
|
||||
uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: Add changelog and docs for ${{ github.event.inputs.saltVersion }} release
|
||||
title: 'Generate Salt Man Page and Changelog'
|
||||
body: >
|
||||
This PR is auto-generated by
|
||||
[create-pull-request](https://github.com/peter-evans/create-pull-request).
|
||||
branch: docs_${{ github.event.inputs.saltVersion }}
|
||||
base: ${{ github.event.inputs.branch }}
|
2
.github/workflows/scheduled.yml
vendored
2
.github/workflows/scheduled.yml
vendored
|
@ -9,7 +9,7 @@ on:
|
|||
- cron: '0 */8 * * *' # Run every 8 hours
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
|
|
2
.github/workflows/templates/layout.yml.jinja
vendored
2
.github/workflows/templates/layout.yml.jinja
vendored
|
@ -15,7 +15,7 @@ on:
|
|||
<%- block env %>
|
||||
|
||||
env:
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
|
|
2
.github/workflows/test-action-macos.yml
vendored
2
.github/workflows/test-action-macos.yml
vendored
|
@ -46,7 +46,7 @@ on:
|
|||
|
||||
env:
|
||||
NOX_VERSION: "2022.8.7"
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/"
|
||||
PIP_EXTRA_INDEX_URL: "https://pypi.org/simple"
|
||||
|
||||
|
|
2
.github/workflows/test-action.yml
vendored
2
.github/workflows/test-action.yml
vendored
|
@ -41,7 +41,7 @@ on:
|
|||
|
||||
env:
|
||||
NOX_VERSION: "2022.8.7"
|
||||
COLUMNS: 160
|
||||
COLUMNS: 190
|
||||
AWS_MAX_ATTEMPTS: "10"
|
||||
AWS_RETRY_MODE: "adaptive"
|
||||
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
|
||||
|
|
Loading…
Add table
Reference in a new issue