From 335933639b0f392986e16ee695bc07ec85fae324 Mon Sep 17 00:00:00 2001 From: Jan Rodak Date: Tue, 23 Apr 2024 11:35:12 +0200 Subject: [PATCH 1/2] Update versions --- .github/workflows/codeql.yml | 8 ++++---- .github/workflows/gating.yaml | 8 ++++---- .github/workflows/python-publish.yml | 4 ++-- .github/workflows/release.yaml | 6 +++--- .github/workflows/weekly-integration-test.yml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 75db48c0..89594e8f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -30,19 +30,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 if: ${{ matrix.language == 'python' || matrix.language == 'javascript' }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}" diff --git a/.github/workflows/gating.yaml b/.github/workflows/gating.yaml index 16fb17af..475b6dec 100644 --- a/.github/workflows/gating.yaml +++ b/.github/workflows/gating.yaml @@ -14,7 +14,7 @@ jobs: - name: Install Deps run: dnf install -y python3-devel python3-setuptools rpm-build - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: python3 setup.py bdist_rpm --requires=python3-lxml,python3-jinja2 --build-requires=python3-devel,python3-setuptools - name: RPM install @@ -34,7 +34,7 @@ jobs: - name: Install Deps run: dnf install -y python3 python3-devel python3-setuptools rpm-build - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: python3 setup.py bdist_rpm --requires=python3-lxml,python3-jinja2 --build-requires=python3-devel,python3-setuptools - name: RPM install @@ -54,7 +54,7 @@ jobs: - name: Install Deps run: dnf install -y python3-devel python3-setuptools rpm-build - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: python3 setup.py bdist_rpm --requires=python3-lxml,python3-jinja2 --build-requires=python3-devel,python3-setuptools - name: RPM install @@ -76,7 +76,7 @@ jobs: - name: Fix missing Deps run: dnf install -y python3-devel python3-setuptools rpm-build - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: python3 setup.py bdist_rpm --requires=python3-lxml,python3-jinja2 --build-requires=python3-devel,python3-setuptools - name: RPM install diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 5386a6a3..4a773adb 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -22,9 +22,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 682a93ea..ee911eb0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,9 +9,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies @@ -22,7 +22,7 @@ jobs: run: python -m build - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: generate_release_notes: true diff --git a/.github/workflows/weekly-integration-test.yml b/.github/workflows/weekly-integration-test.yml index 148bd407..fc92b7ad 100644 --- a/.github/workflows/weekly-integration-test.yml +++ b/.github/workflows/weekly-integration-test.yml @@ -13,6 +13,6 @@ jobs: - name: Install Deps run: dnf install -y tmt python3-setuptools - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Execute test run: tmt -c distro=fedora run --all provision --how=local From f2fb7e449d3b50e105c406e84cea16fdd344aab8 Mon Sep 17 00:00:00 2001 From: Jan Rodak Date: Tue, 23 Apr 2024 11:36:52 +0200 Subject: [PATCH 2/2] Change Archive name of openscap-report According: https://peps.python.org/pep-0491/#escaping-and-unicode --- .github/workflows/release.yaml | 2 +- openscap-report.spec | 2 +- spec/rhel8/openscap-report.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ee911eb0..31d7089c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,4 +26,4 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: generate_release_notes: true - files: dist/openscap-report-*.tar.gz + files: dist/openscap_report-*.tar.gz diff --git a/openscap-report.spec b/openscap-report.spec index 72665bfd..473414fc 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -8,7 +8,7 @@ Summary: A tool for generating human-readable reports from (SCAP) XCCDF a # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain License: LGPLv2+ and GPLv2+ and MIT and Public Domain URL: https://github.com/OpenSCAP/%{name} -Source0: https://github.com/OpenSCAP/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/OpenSCAP/%{name}/releases/download/v%{version}/%{pymodule_name}-%{version}.tar.gz BuildArch: noarch diff --git a/spec/rhel8/openscap-report.spec b/spec/rhel8/openscap-report.spec index c8ee3202..3a120821 100644 --- a/spec/rhel8/openscap-report.spec +++ b/spec/rhel8/openscap-report.spec @@ -8,7 +8,7 @@ Summary: A tool for generating human-readable reports from (SCAP) XCCDF a # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain License: LGPLv2+ and GPLv2+ and MIT and Public Domain URL: https://github.com/OpenSCAP/%{name} -Source0: https://github.com/OpenSCAP/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/OpenSCAP/%{name}/releases/download/v%{version}/%{pymodule_name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel