mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
feat(generate): use temp. workaround to avoid git
builds on Fedora 37+
This commit is contained in:
parent
4f8fa0bf45
commit
705dc7b801
2 changed files with 17 additions and 2 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -375,7 +375,7 @@ jobs:
|
||||||
distro-slug: fedora-37
|
distro-slug: fedora-37
|
||||||
display-name: Fedora 37
|
display-name: Fedora 37
|
||||||
timeout: 20
|
timeout: 20
|
||||||
instances: '["git-master", "latest"]'
|
instances: '["latest"]'
|
||||||
|
|
||||||
|
|
||||||
fedora-38:
|
fedora-38:
|
||||||
|
@ -389,7 +389,7 @@ jobs:
|
||||||
distro-slug: fedora-38
|
distro-slug: fedora-38
|
||||||
display-name: Fedora 38
|
display-name: Fedora 38
|
||||||
timeout: 20
|
timeout: 20
|
||||||
instances: '["git-master", "latest"]'
|
instances: '["latest"]'
|
||||||
|
|
||||||
|
|
||||||
gentoo:
|
gentoo:
|
||||||
|
|
15
.github/workflows/templates/generate.py
vendored
15
.github/workflows/templates/generate.py
vendored
|
@ -212,6 +212,19 @@ GIT_VERSION_BLACKLIST = [
|
||||||
"nightly",
|
"nightly",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# TODO: Revert the commit relating to this section, once the Git-based builds
|
||||||
|
# have been fixed for the distros listed below
|
||||||
|
#
|
||||||
|
# Apparent failure is:
|
||||||
|
#
|
||||||
|
# /usr/lib/python3.11/site-packages/setuptools/command/install.py:34:
|
||||||
|
# SetuptoolsDeprecationWarning: setup.py install is deprecated.
|
||||||
|
# Use build and pip and other standards-based tools.
|
||||||
|
GIT_DISTRO_BLACKLIST = [
|
||||||
|
"fedora-37",
|
||||||
|
"fedora-38",
|
||||||
|
]
|
||||||
|
|
||||||
LATEST_PKG_BLACKLIST = []
|
LATEST_PKG_BLACKLIST = []
|
||||||
|
|
||||||
DISTRO_DISPLAY_NAMES = {
|
DISTRO_DISPLAY_NAMES = {
|
||||||
|
@ -472,6 +485,8 @@ def generate_test_jobs():
|
||||||
if bootstrap_type == "git":
|
if bootstrap_type == "git":
|
||||||
if salt_version in GIT_VERSION_BLACKLIST:
|
if salt_version in GIT_VERSION_BLACKLIST:
|
||||||
continue
|
continue
|
||||||
|
if distro in GIT_DISTRO_BLACKLIST:
|
||||||
|
continue
|
||||||
|
|
||||||
BLACKLIST = {
|
BLACKLIST = {
|
||||||
"3003": BLACKLIST_3003,
|
"3003": BLACKLIST_3003,
|
||||||
|
|
Loading…
Add table
Reference in a new issue