ci: Change order of input requirements files

Order of input files matter in pip-compile-cross-platform. The latter file has higher priority and overrides version of package set in former file. Signed-off-by: Jan Gałda <[email protected]>
nrfconnect · Nov 12, 2024 · 47fe51e · 47fe51e
1 parent 279234d
commit 47fe51e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/validate-pip-requirements-fixed-file.yml b/.github/workflows/validate-pip-requirements-fixed-file.yml
@@ -65,11 +65,11 @@ jobs:
               pip-compile-cross-platform==1.4.2+nordic.2 --upgrade > /dev/null 2>&1
             pip-compile-cross-platform \
               bootloader/mcuboot/scripts/requirements.txt \
+              zephyr/scripts/requirements.txt \
+              nrf/scripts/requirements-west-ncs-sbom.txt \
               nrf/scripts/requirements-ci.txt \
               nrf/scripts/requirements-extra.txt \
               nrf/scripts/requirements.txt \
-              zephyr/scripts/requirements.txt \
-              nrf/scripts/requirements-west-ncs-sbom.txt \
               --output-file nrf/scripts/requirements-fixed.txt \
               --min-python-version 3.10
 

diff --git a/scripts/requirements-ci.txt b/scripts/requirements-ci.txt
@@ -2,7 +2,7 @@ aenum
 bitarray
 chardet
 gitlint==0.19.1
-GitPython==3.1.41
+GitPython
 jsonschema
 milksnake
 py

diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile-cross-platform
 # To update, run:
 #
-#    pip-compile-cross-platform bootloader/mcuboot/scripts/requirements.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt zephyr/scripts/requirements.txt nrf/scripts/requirements-west-ncs-sbom.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.10
+#    pip-compile-cross-platform bootloader/mcuboot/scripts/requirements.txt zephyr/scripts/requirements.txt nrf/scripts/requirements-west-ncs-sbom.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.10
 #
 --extra-index-url https://files.nordicsemi.com/artifactory/api/pypi/nordic-pypi/simple