From 478d65036e2bf42d02aed4cf64dd816ca17c9ca2 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Thu, 9 Jan 2025 10:58:38 +0000 Subject: [PATCH 1/3] Fix the ctest of python-unit-utils/oscal by bumping the compliance-trestle version in requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fa3aed292ae..690d3ca9377 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ pycompliance prometheus_client # used in utils/oscal requests -compliance-trestle==2.4.0 +compliance-trestle==3.6.0 From b3dc29a0e195a3561124fce712ea1d18e950a026 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Thu, 9 Jan 2025 12:58:59 +0000 Subject: [PATCH 2/3] Skip the confirmation --- .github/workflows/gate.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 518286d8a1d..6a4b7fe81de 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Install Deps - run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck + run: sudo apt-get update && sudo apt-get install -y cmake ninja-build libopenscap8 libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Install deps python @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Install Deps - run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck + run: sudo apt-get update && sudo apt-get install -y cmake ninja-build libopenscap8 libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Install deps python @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Deps - run: sudo apt-get update && sudo apt-get install cmake ninja-build openscap-utils libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck + run: sudo apt-get update && sudo apt-get install -y cmake ninja-build openscap-utils libxml2-utils xsltproc ansible-lint bats python3-github python3-jinja2 python3-pip python3-pytest python3-pytest-cov python3-setuptools python3-yaml shellcheck - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Install deps python From 9452e2614798e3f02a9f457c086f39b22a37bee6 Mon Sep 17 00:00:00 2001 From: Alan Moore Date: Thu, 9 Jan 2025 13:27:15 +0000 Subject: [PATCH 3/3] Mandate the pyopenssl version --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 690d3ca9377..9b849827bdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,4 @@ prometheus_client # used in utils/oscal requests compliance-trestle==3.6.0 +pyopenssl>=23.2.0