CI: Lint backend after testing, to catch build failures early (#33622)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
+1
-1
@@ -215,6 +215,7 @@ def lint_backend_step(edition):
|
||||
},
|
||||
'depends_on': [
|
||||
'initialize',
|
||||
'test-backend' + enterprise2_sfx(edition),
|
||||
],
|
||||
'commands': [
|
||||
# Don't use Make since it will re-download the linters
|
||||
@@ -451,7 +452,6 @@ def test_backend_step(edition):
|
||||
'image': build_image,
|
||||
'depends_on': [
|
||||
'initialize',
|
||||
'lint-backend' + enterprise2_sfx(edition),
|
||||
],
|
||||
'commands': [
|
||||
# First make sure that there are no tests with FocusConvey
|
||||
|
||||
+2
-2
@@ -43,10 +43,10 @@ def get_steps(edition, is_downstream=False):
|
||||
include_enterprise2 = edition == 'enterprise'
|
||||
steps = [
|
||||
enterprise_downstream_step(edition=edition),
|
||||
lint_backend_step(edition=edition),
|
||||
codespell_step(),
|
||||
shellcheck_step(),
|
||||
test_backend_step(edition=edition),
|
||||
lint_backend_step(edition=edition),
|
||||
test_frontend_step(),
|
||||
frontend_metrics_step(edition=edition),
|
||||
build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
|
||||
@@ -58,8 +58,8 @@ def get_steps(edition, is_downstream=False):
|
||||
if include_enterprise2:
|
||||
edition2 = 'enterprise2'
|
||||
steps.extend([
|
||||
lint_backend_step(edition=edition2),
|
||||
test_backend_step(edition=edition2),
|
||||
lint_backend_step(edition=edition2),
|
||||
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream),
|
||||
])
|
||||
|
||||
|
||||
+2
-2
@@ -34,10 +34,10 @@ def pr_pipelines(edition):
|
||||
variants = ['linux-x64', 'linux-x64-musl', 'osx64', 'win64',]
|
||||
include_enterprise2 = edition == 'enterprise'
|
||||
steps = [
|
||||
lint_backend_step(edition=edition),
|
||||
codespell_step(),
|
||||
shellcheck_step(),
|
||||
test_backend_step(edition=edition),
|
||||
lint_backend_step(edition=edition),
|
||||
test_frontend_step(),
|
||||
build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
|
||||
build_frontend_step(edition=edition, ver_mode=ver_mode),
|
||||
@@ -50,8 +50,8 @@ def pr_pipelines(edition):
|
||||
steps.append(benchmark_ldap_step())
|
||||
services.append(ldap_service())
|
||||
steps.extend([
|
||||
lint_backend_step(edition=edition2),
|
||||
test_backend_step(edition=edition2),
|
||||
lint_backend_step(edition=edition2),
|
||||
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
|
||||
])
|
||||
|
||||
|
||||
@@ -68,10 +68,10 @@ def get_steps(edition, ver_mode):
|
||||
include_enterprise2 = edition == 'enterprise'
|
||||
|
||||
steps = [
|
||||
lint_backend_step(edition=edition),
|
||||
codespell_step(),
|
||||
shellcheck_step(),
|
||||
test_backend_step(edition=edition),
|
||||
lint_backend_step(edition=edition),
|
||||
test_frontend_step(),
|
||||
build_backend_step(edition=edition, ver_mode=ver_mode),
|
||||
build_frontend_step(edition=edition, ver_mode=ver_mode),
|
||||
@@ -82,8 +82,8 @@ def get_steps(edition, ver_mode):
|
||||
if include_enterprise2:
|
||||
edition2 = 'enterprise2'
|
||||
steps.extend([
|
||||
lint_backend_step(edition=edition2),
|
||||
test_backend_step(edition=edition2),
|
||||
lint_backend_step(edition=edition2),
|
||||
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
|
||||
])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user