Skip to content

Commit

Permalink
Merge pull request #98 from lcarva/fix-rpm-repos
Browse files Browse the repository at this point in the history
Remove duplicated repo entries
  • Loading branch information
lcarva authored Jan 6, 2025
2 parents 09f2061 + b23b05c commit 1df0c3c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions data/known_rpm_repositories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hack/update-known-rpm-repositories.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1df0c3c

Please sign in to comment.