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

Make jinja rendering strict. Undefined variable use throws error.

Browse source
This commit is contained in:
Pedro Algarvio 2024-03-27 14:20:50 +00:00
parent 78625d8db7
commit 5c4e810836
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/templates/build-packages.yml.jinja vendored
View file

@ -17,7 +17,7 @@
relenv-version: "<{ relenv_version }>" relenv-version: "<{ relenv_version }>"
python-version: "<{ python_version }>" python-version: "<{ python_version }>"
source: "<{ backend }>" source: "<{ backend }>"
<%- if gh_environment %> <%- if gh_environment != "ci" %>
environment: <{ gh_environment }> environment: <{ gh_environment }>
sign-macos-packages: true sign-macos-packages: true
sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %> sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>

2
.github/workflows/templates/ci.yml.jinja vendored
View file

@ -1,3 +1,5 @@
<%- set gh_environment = gh_environment|default("ci") %>
<%- extends 'layout.yml.jinja' %> <%- extends 'layout.yml.jinja' %>
<%- set pre_commit_version = "3.0.4" %> <%- set pre_commit_version = "3.0.4" %>

3
tools/precommit/workflows.py
View file

@ -11,7 +11,7 @@ import shutil
from typing import TYPE_CHECKING, cast from typing import TYPE_CHECKING, cast
import yaml import yaml
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader, StrictUndefined
from ptscripts import Context, command_group from ptscripts import Context, command_group
import tools.utils import tools.utils
@ -292,6 +292,7 @@ def generate_workflows(ctx: Context):
"jinja2.ext.do", "jinja2.ext.do",
], ],
loader=FileSystemLoader(str(TEMPLATES)), loader=FileSystemLoader(str(TEMPLATES)),
undefined=StrictUndefined,
) )
for workflow_name, details in workflows.items(): for workflow_name, details in workflows.items():
if TYPE_CHECKING: if TYPE_CHECKING: