From: Frank Brehm Date: Thu, 29 Dec 2022 16:37:08 +0000 (+0100) Subject: Adding needs X-Git-Tag: v1.0~7 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=44de587edb46bb418e80181fb7b6e1be67a085c6;p=pixelpark%2Fpython-packaging.git Adding needs --- diff --git a/gitlab/build-python-packages.yaml b/gitlab/build-python-packages.yaml index 8cad32b..6780f3e 100644 --- a/gitlab/build-python-packages.yaml +++ b/gitlab/build-python-packages.yaml @@ -12,6 +12,8 @@ build CentOS 7 with Python 3.6: PYTHON_VERSION_NODOT: '36' extends: - '.setup-build-environment' + needs: + - 'Linter' image: centos:7 # --------------------------- @@ -23,6 +25,8 @@ build CentOS 8 with Python 3.8: PYTHON_VERSION_NODOT: '38' extends: - '.setup-build-environment' + needs: + - 'Linter' image: dokken/centos-stream-8 # --------------------------- @@ -34,6 +38,8 @@ build CentOS 9 with Python 3: PYTHON_VERSION_NODOT: '3' extends: - '.setup-build-environment' + needs: + - 'Linter' image: dokken/centos-stream-9 # vim: et tabstop=2 expandtab shiftwidth=2 softtabstop=2 list diff --git a/gitlab/build-template-python.yaml b/gitlab/build-template-python.yaml index 458279c..82a0f39 100644 --- a/gitlab/build-template-python.yaml +++ b/gitlab/build-template-python.yaml @@ -109,11 +109,13 @@ variables: fi echo -e "\e[0Ksection_end:$( date +%s ):install_locales\r\e[0K" - | + echo -e "\e[0Ksection_start:$( date +%s ):all_locales[collapsed=true]\r\e[0KAll locales" echo "All locales" locale -a echo echo "locales:" locale + echo -e "\e[0Ksection_end:$( date +%s ):all_locales\r\e[0K" - | echo echo "Exporting LC_ALL ..." @@ -272,8 +274,8 @@ variables: echo -e "\e[0Ksection_end:$( date +%s ):specfile\r\e[0K" - | echo "Creating ${HOME}/.rpmmacros ..." - echo "%__python3 /bin/python${PYTHON_VERSION_DOT}" > "${HOME}/.rpmmacros" - echo "%_signature gpg" >> "${HOME}/.rpmmacros" + echo "%__python3 /bin/python${PYTHON_VERSION_DOT}" > "${HOME}/.rpmmacros" + echo "%_signature gpg" >> "${HOME}/.rpmmacros" echo "Generated ${HOME}/.rpmmacros:" cat "${HOME}/.rpmmacros" - | diff --git a/gitlab/linter.yaml b/gitlab/linter.yaml index 860a873..e7105ad 100644 --- a/gitlab/linter.yaml +++ b/gitlab/linter.yaml @@ -18,6 +18,13 @@ Linter: - if: $CI_COMMIT_BRANCH =~ /test-.*/ - if: $CI_COMMIT_BRANCH =~ /build.*/ - if: $CI_COMMIT_BRANCH == "develop" + needs: + - 'test Python 3.6' + - 'test Python 3.7' + - 'test Python 3.8' + - 'test Python 3.9' + - 'test Python 3.10' + - 'test Python 3.11' tags: - docker before_script: