From 70aa4f686d91f89e82c363ba84167e846831341c Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Thu, 10 Oct 2024 16:29:39 -0500 Subject: [PATCH 1/2] build(deps): bump craft-application to 4.2.7 Signed-off-by: Callahan Kovacs --- requirements-devel.txt | 2 +- requirements-docs.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index da45be35cf..02f505e465 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -24,7 +24,7 @@ click==8.1.7 codespell==2.3.0 colorama==0.4.6 coverage==7.6.1 -craft-application==4.2.6 +craft-application==4.2.7 craft-archives==2.0.0 craft-cli==2.7.0 craft-grammar==2.0.1 diff --git a/requirements-docs.txt b/requirements-docs.txt index 1c690ec149..4047db4013 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -19,7 +19,7 @@ chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -craft-application==4.2.6 +craft-application==4.2.7 craft-archives==2.0.0 craft-cli==2.7.0 craft-grammar==2.0.1 diff --git a/requirements.txt b/requirements.txt index d69ae9cef6..bd589d3928 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ cffi==1.17.1 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 -craft-application==4.2.6 +craft-application==4.2.7 craft-archives==2.0.0 craft-cli==2.7.0 craft-grammar==2.0.1 diff --git a/setup.py b/setup.py index fdfb1be53b..2f0f14b462 100755 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def recursive_data_files(directory, install_directory): "attrs", "catkin-pkg; sys_platform == 'linux'", "click", - "craft-application>=4.2.6,<5.0.0", + "craft-application>=4.2.7,<5.0.0", "craft-archives~=2.0", "craft-cli~=2.6", "craft-grammar>=2.0.1,<3.0.0", From 3863bacac04192d0e5b857c5f4c42d2340b8512d Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Thu, 10 Oct 2024 09:49:31 -0500 Subject: [PATCH 2/2] tests: check parallel build count in project metadata Signed-off-by: Callahan Kovacs --- .../core24-suites/environment/test-variables/task.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/spread/core24-suites/environment/test-variables/task.yaml b/tests/spread/core24-suites/environment/test-variables/task.yaml index f9fb09d0a2..22d50aeed0 100644 --- a/tests/spread/core24-suites/environment/test-variables/task.yaml +++ b/tests/spread/core24-suites/environment/test-variables/task.yaml @@ -8,6 +8,7 @@ systems: environment: SNAP/test_variables: test-variables + SNAPCRAFT_PARALLEL_BUILD_COUNT: 5 prepare: | #shellcheck source=tests/spread/tools/snapcraft-yaml.sh @@ -35,7 +36,7 @@ execute: | "^SNAPCRAFT_PROJECT_GRADE=devel$" \ "^SNAPCRAFT_PROJECT_NAME=variables$" \ "^SNAPCRAFT_PROJECT_VERSION=1$" \ - "^SNAPCRAFT_PARALLEL_BUILD_COUNT=[0-9]\+$" \ + "^SNAPCRAFT_PARALLEL_BUILD_COUNT=5$" \ "^SNAPCRAFT_PROJECT_DIR=${root}$" \ "^SNAPCRAFT_PART_SRC=${root}/parts/hello/src$" \ "^SNAPCRAFT_PART_SRC_WORK=${root}/parts/hello/src$" \ @@ -48,7 +49,7 @@ execute: | "^CRAFT_ARCH_TRIPLET_BUILD_ON=x86_64-linux-gnu$" \ "^CRAFT_ARCH_BUILD_FOR=s390x$" \ "^CRAFT_ARCH_TRIPLET_BUILD_FOR=s390x-linux-gnu$" \ - "^CRAFT_PARALLEL_BUILD_COUNT=[0-9]\+$" \ + "^CRAFT_PARALLEL_BUILD_COUNT=5$" \ "^CRAFT_PROJECT_DIR=${root}$" \ "^CRAFT_PART_NAME=hello$" \ "^CRAFT_PART_SRC=${root}/parts/hello/src$" \