From 820098fa760ebeff5fb2097109b41155bab52ea5 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Wed, 24 Jul 2024 10:56:26 +0200 Subject: [PATCH 1/4] fix(python*): missing libgcc-s1 for arm --- slices/libpython3.8-stdlib.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/slices/libpython3.8-stdlib.yaml b/slices/libpython3.8-stdlib.yaml index 07b41078a..51739970c 100644 --- a/slices/libpython3.8-stdlib.yaml +++ b/slices/libpython3.8-stdlib.yaml @@ -13,6 +13,13 @@ slices: essential: - libbz2-1.0_libs - libc6_libs + # Adding libgcc-s1 here because it is required for the arm arch. + # In practice, libc6 should bring it anyway, BUT, there is a circular + # dependency in the archives, where libc6 depends on libgcc-s1 and + # vice versa. We don't allow that circular dependency to exist in Chisel + # and libgcc-s1 already depends on libc6, so we'll have to include this + # line here, explicitly. + - libgcc-s1_libs - liblzma5_libs - libpython3.8-minimal_libs - mime-support_mime-types From aabcf9ad3ccf5331788657f214b376d3fb919fc2 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Wed, 24 Jul 2024 13:45:56 +0200 Subject: [PATCH 2/4] ci: add missing spread tests --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9187a7ee1..06f09607a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,3 +19,7 @@ jobs: lint: name: Lint uses: canonical/chisel-releases/.github/workflows/lint.yaml@main + + integration-tests: + name: Integration tests + uses: canonical/chisel-releases/.github/workflows/spread.yaml@main From 5c72a19693d7af75d83bcf80e3212dbf8004b61a Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Wed, 24 Jul 2024 14:05:09 +0200 Subject: [PATCH 3/4] test --- tests/spread/integration/base-passwd/task.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spread/integration/base-passwd/task.yaml b/tests/spread/integration/base-passwd/task.yaml index 7b0b74638..9bd8e9b56 100644 --- a/tests/spread/integration/base-passwd/task.yaml +++ b/tests/spread/integration/base-passwd/task.yaml @@ -2,6 +2,7 @@ summary: Integration tests for base-passwd execute: | rootfs="$(install-slices base-passwd_data)" + # TEST test -f ${rootfs}/etc/group ! grep FIXME ${rootfs}/etc/group From 7c6fcf42910e0905aeaf8164d381e870d8b1cc4e Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Wed, 24 Jul 2024 14:09:23 +0200 Subject: [PATCH 4/4] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06f09607a..93fffa80b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,4 +22,4 @@ jobs: integration-tests: name: Integration tests - uses: canonical/chisel-releases/.github/workflows/spread.yaml@main + uses: cjdcordeiro/chisel-releases/.github/workflows/spread.yaml@main