Skip to content

Commit

Permalink
Merge pull request #229 from Honny1/fix-python-archive-name
Browse files Browse the repository at this point in the history
Fix python archive name
  • Loading branch information
Honny1 committed Apr 23, 2024
2 parents d891ed0 + f2fb7e4 commit ac88606
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
8 changes: 4 additions & 4 deletions .github/workflows/gating.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,8 +22,8 @@ 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
files: dist/openscap-report-*.tar.gz
files: dist/openscap_report-*.tar.gz
2 changes: 1 addition & 1 deletion .github/workflows/weekly-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion openscap-report.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/rhel8/openscap-report.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac88606

Please sign in to comment.