Skip to content

Commit 47fe51e

Browse files
jangalda-nscnordicjm
authored andcommitted
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]>
1 parent 279234d commit 47fe51e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/validate-pip-requirements-fixed-file.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ jobs:
6565
pip-compile-cross-platform==1.4.2+nordic.2 --upgrade > /dev/null 2>&1
6666
pip-compile-cross-platform \
6767
bootloader/mcuboot/scripts/requirements.txt \
68+
zephyr/scripts/requirements.txt \
69+
nrf/scripts/requirements-west-ncs-sbom.txt \
6870
nrf/scripts/requirements-ci.txt \
6971
nrf/scripts/requirements-extra.txt \
7072
nrf/scripts/requirements.txt \
71-
zephyr/scripts/requirements.txt \
72-
nrf/scripts/requirements-west-ncs-sbom.txt \
7373
--output-file nrf/scripts/requirements-fixed.txt \
7474
--min-python-version 3.10
7575

scripts/requirements-ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ aenum
22
bitarray
33
chardet
44
gitlint==0.19.1
5-
GitPython==3.1.41
5+
GitPython
66
jsonschema
77
milksnake
88
py

scripts/requirements-fixed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile-cross-platform
33
# To update, run:
44
#
5-
# 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
5+
# 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
66
#
77
--extra-index-url https://files.nordicsemi.com/artifactory/api/pypi/nordic-pypi/simple
88

0 commit comments

Comments
 (0)