mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix caches
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio
Pedro Algarvio
parent
2193e44d42
commit
65a17e5603
7 changed files with 92 additions and 29 deletions
|
|
@ -24,11 +24,6 @@ runs:
|
|||
|
||||
steps:
|
||||
|
||||
- name: Install Nox
|
||||
shell: bash
|
||||
run: |
|
||||
nox --version || python3 -m pip install nox==${{ inputs.nox-version }}
|
||||
|
||||
- name: Download Release Patch
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
|
|
@ -49,7 +44,7 @@ runs:
|
|||
- name: Create Source Tarball
|
||||
shell: bash
|
||||
run: |
|
||||
nox -e build
|
||||
tools pkg source-tarball
|
||||
|
||||
- name: Create Hash Files
|
||||
shell: bash
|
||||
|
|
|
|||
6
.github/workflows/build-docs.yml
vendored
6
.github/workflows/build-docs.yml
vendored
|
|
@ -61,12 +61,12 @@ jobs:
|
|||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
||||
- name: Cache Python Tools Virtualenvs
|
||||
- name: Cache Python Tools Docs Virtualenv
|
||||
id: tools-venvs-dependencies-cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/
|
||||
key: ${{ inputs.cache-seed }}|${{ github.workflow }}|tools-venvs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/*.txt') }}
|
||||
path: .tools-venvs/docs
|
||||
key: ${{ inputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
|
||||
|
||||
- name: Prepare Docs Build
|
||||
run: |
|
||||
|
|
|
|||
27
.github/workflows/ci.yml
vendored
27
.github/workflows/ci.yml
vendored
|
|
@ -8,7 +8,7 @@ on:
|
|||
|
||||
env:
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
permissions:
|
||||
|
|
@ -224,12 +224,17 @@ jobs:
|
|||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Cache Python Tools Virtualenvs
|
||||
id: tools-venvs-dependencies-cache
|
||||
- name: Cache Python Tools Docs Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/*.txt') }}
|
||||
path: .tools-venvs/docs
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
|
||||
|
||||
- name: Cache Python Tools Changelog Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/changelog
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|changelog|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/changelog.txt') }}
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
|
@ -335,6 +340,12 @@ jobs:
|
|||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
- name: Get Python Version
|
||||
id: get-python-version
|
||||
uses: ./.github/actions/get-python-version
|
||||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
||||
|
|
@ -344,6 +355,12 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
||||
- name: Cache Python Tools Build Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/build
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/build.txt') }}
|
||||
|
||||
- name: Build Source Tarball
|
||||
uses: ./.github/actions/build-source-tarball
|
||||
with:
|
||||
|
|
|
|||
27
.github/workflows/nightly.yml
vendored
27
.github/workflows/nightly.yml
vendored
|
|
@ -10,7 +10,7 @@ on:
|
|||
|
||||
env:
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
permissions:
|
||||
|
|
@ -222,12 +222,17 @@ jobs:
|
|||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Cache Python Tools Virtualenvs
|
||||
id: tools-venvs-dependencies-cache
|
||||
- name: Cache Python Tools Docs Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/*.txt') }}
|
||||
path: .tools-venvs/docs
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
|
||||
|
||||
- name: Cache Python Tools Changelog Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/changelog
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|changelog|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/changelog.txt') }}
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
|
@ -333,6 +338,12 @@ jobs:
|
|||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
- name: Get Python Version
|
||||
id: get-python-version
|
||||
uses: ./.github/actions/get-python-version
|
||||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
||||
|
|
@ -342,6 +353,12 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
||||
- name: Cache Python Tools Build Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/build
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/build.txt') }}
|
||||
|
||||
- name: Build Source Tarball
|
||||
uses: ./.github/actions/build-source-tarball
|
||||
with:
|
||||
|
|
|
|||
27
.github/workflows/scheduled.yml
vendored
27
.github/workflows/scheduled.yml
vendored
|
|
@ -10,7 +10,7 @@ on:
|
|||
|
||||
env:
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
permissions:
|
||||
|
|
@ -222,12 +222,17 @@ jobs:
|
|||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Cache Python Tools Virtualenvs
|
||||
id: tools-venvs-dependencies-cache
|
||||
- name: Cache Python Tools Docs Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/*.txt') }}
|
||||
path: .tools-venvs/docs
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
|
||||
|
||||
- name: Cache Python Tools Changelog Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/changelog
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|changelog|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/changelog.txt') }}
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
|
@ -333,6 +338,12 @@ jobs:
|
|||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
- name: Get Python Version
|
||||
id: get-python-version
|
||||
uses: ./.github/actions/get-python-version
|
||||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
||||
|
|
@ -342,6 +353,12 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
||||
- name: Cache Python Tools Build Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/build
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/build.txt') }}
|
||||
|
||||
- name: Build Source Tarball
|
||||
uses: ./.github/actions/build-source-tarball
|
||||
with:
|
||||
|
|
|
|||
25
.github/workflows/templates/ci.yml.jinja
vendored
25
.github/workflows/templates/ci.yml.jinja
vendored
|
|
@ -62,12 +62,17 @@ on:
|
|||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Cache Python Tools Virtualenvs
|
||||
id: tools-venvs-dependencies-cache
|
||||
- name: Cache Python Tools Docs Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/*.txt') }}
|
||||
path: .tools-venvs/docs
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
|
||||
|
||||
- name: Cache Python Tools Changelog Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/changelog
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|changelog|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/changelog.txt') }}
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
|
@ -186,6 +191,12 @@ on:
|
|||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
- name: Get Python Version
|
||||
id: get-python-version
|
||||
uses: ./.github/actions/get-python-version
|
||||
with:
|
||||
python-binary: python3
|
||||
|
||||
- name: Setup Python Tools Scripts
|
||||
uses: ./.github/actions/setup-python-tools-scripts
|
||||
|
||||
|
|
@ -195,6 +206,12 @@ on:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
||||
- name: Cache Python Tools Build Virtualenv
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .tools-venvs/build
|
||||
key: ${{ needs.prepare-workflow.outputs.cache-seed }}|${{ github.workflow }}|tools-venvs|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/build.txt') }}
|
||||
|
||||
- name: Build Source Tarball
|
||||
uses: ./.github/actions/build-source-tarball
|
||||
with:
|
||||
|
|
|
|||
2
.github/workflows/templates/layout.yml.jinja
vendored
2
.github/workflows/templates/layout.yml.jinja
vendored
|
|
@ -20,7 +20,7 @@ on:
|
|||
|
||||
env:
|
||||
COLUMNS: 190
|
||||
CACHE_SEED: SEED-0 # Bump the number to invalidate all caches
|
||||
CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
|
||||
RELENV_DATA: "${{ github.workspace }}/.relenv"
|
||||
|
||||
<%- endblock env %>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue