From 8bc7a2d3cb92497e12897a978f3e6bf786004cae Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Mon, 6 Jan 2025 09:35:16 -0500 Subject: [PATCH 1/2] Remove duplicated repo entries Some of the repos from extra_rpm_repositories are now being available in the official source. This commit deduplicates entries in the final output. Signed-off-by: Luiz Carvalho --- data/known_rpm_repositories.yml | 9 --------- hack/update-known-rpm-repositories.sh | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/data/known_rpm_repositories.yml b/data/known_rpm_repositories.yml index 31dea2b..08f9916 100644 --- a/data/known_rpm_repositories.yml +++ b/data/known_rpm_repositories.yml @@ -6562,10 +6562,8 @@ rule_data: - "rhel-7-workstation-supplementary-rpms" - "rhel-7-workstation-supplementary-source-rpms" - "rhel-8-appstream-rpms" - - "rhel-8-appstream-rpms" - "rhel-8-appstream-source-rpms" - "rhel-8-baseos-rpms" - - "rhel-8-baseos-rpms" - "rhel-8-baseos-source-rpms" - "rhel-8-codeready-builder-rpms" - "rhel-8-codeready-builder-source-rpms" @@ -7434,10 +7432,8 @@ rule_data: - "rhel-8-for-x86_64-supplementary-rpms" - "rhel-8-for-x86_64-supplementary-source-rpms" - "rhel-9-appstream-rpms" - - "rhel-9-appstream-rpms" - "rhel-9-appstream-source-rpms" - "rhel-9-baseos-rpms" - - "rhel-9-baseos-rpms" - "rhel-9-baseos-source-rpms" - "rhel-9-codeready-builder-rpms" - "rhel-9-codeready-builder-source-rpms" @@ -10068,11 +10064,8 @@ rule_data: - "ubi-10-codeready-builder-source-rpms" - "ubi-8-appstream-debug-rpms" - "ubi-8-appstream-rpms" - - "ubi-8-appstream-rpms" - "ubi-8-appstream-source" - "ubi-8-baseos-debug-rpms" - - "ubi-8-baseos-debug-rpms" - - "ubi-8-baseos-rpms" - "ubi-8-baseos-rpms" - "ubi-8-baseos-source" - "ubi-8-baseos-source-rpms" @@ -10106,12 +10099,10 @@ rule_data: - "ubi-8-for-x86_64-baseos-source-rpms" - "ubi-9-appstream-debug-rpms" - "ubi-9-appstream-rpms" - - "ubi-9-appstream-rpms" - "ubi-9-appstream-source" - "ubi-9-appstream-source-rpms" - "ubi-9-baseos-debug-rpms" - "ubi-9-baseos-rpms" - - "ubi-9-baseos-rpms" - "ubi-9-baseos-source" - "ubi-9-baseos-source-rpms" - "ubi-9-codeready-builder" diff --git a/hack/update-known-rpm-repositories.sh b/hack/update-known-rpm-repositories.sh index ba35f2e..89d31f8 100755 --- a/hack/update-known-rpm-repositories.sh +++ b/hack/update-known-rpm-repositories.sh @@ -15,6 +15,6 @@ This file is automatically generated by hack/update-repository-to-cpe.sh. Do not curl -L "${BASE_URL}" | \ yq '.data | [to_entries[].key] as $repos | - $repos + load("hack/extra_rpm_repositories.yml").extras | sort as $repos | + $repos + load("hack/extra_rpm_repositories.yml").extras | sort | unique as $repos | {"rule_data": {"known_rpm_repositories": $repos}} | . head_comment=env(COMMENT)' > data/known_rpm_repositories.yml From b23b05cb0137f170483e0536ee6997f7f79bc9f2 Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Mon, 6 Jan 2025 09:38:14 -0500 Subject: [PATCH 2/2] Use a pinned version of EC The latest EC release doesn't include binaries. Let's use a known working release instead. Signed-off-by: Luiz Carvalho --- .github/workflows/tests.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ba3f1ed..d2da590 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,9 @@ jobs: - name: Install ec-cli run: |- mkdir -p "${HOME}/.local/bin" - curl -sL https://github.com/enterprise-contract/ec-cli/releases/download/snapshot/ec_linux_amd64 -o "${HOME}/.local/bin/ec" + # curl -sL https://github.com/enterprise-contract/ec-cli/releases/download/snapshot/ec_linux_amd64 -o "${HOME}/.local/bin/ec" + # Workaround until the EC release is fixed. + curl -sL https://github.com/enterprise-contract/ec-cli/releases/download/v0.6.150/ec_linux_amd64 -o "${HOME}/.local/bin/ec" chmod +x "${HOME}/.local/bin/ec" ec version