Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
Expand All @@ -26,7 +26,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
python -m pip install poetry poetry poetry-plugin-export
python -m pip install poetry poetry-plugin-export

- name: Test with tox
run: tox
Expand All @@ -42,7 +42,7 @@ jobs:
python-version: 3.12

- name: Get cASO repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}

Expand Down Expand Up @@ -80,10 +80,10 @@ jobs:
- build-sdist
steps:
- name: Get cASO repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}

- name: Copy debian file into the correct place for the build
run: cp -r packaging/debian debian

Expand Down Expand Up @@ -114,12 +114,6 @@ jobs:
- name: Now build package
run: dpkg-buildpackage -b

- name: debug
run: ls

- name: debug
run: ls ..

- name: Update DEB artifacts to release
if: github.event_name == 'release'
uses: AButler/upload-release-assets@v2.0
Expand All @@ -140,9 +134,8 @@ jobs:
python-version: 3.12

- name: Get cASO repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: IFCA/caso
ref: ${{ github.ref_name }}

- name: Write release version
Expand All @@ -155,9 +148,6 @@ jobs:
with:
name: caso-${{ env.VERSION }}.tar.gz
path: dist

- name: debug
run: ls

- name: Build RPM package
id: rpm
Expand All @@ -172,3 +162,4 @@ jobs:
with:
files: '${{ steps.rpm.outputs.rpm_dir_path }}/*/*rpm'
repo-token: ${{ secrets.GITHUB_TOKEN }}

2 changes: 1 addition & 1 deletion packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: python3-caso
Section: net
Priority: extra
Maintainer: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Homepage: https://github.com/IFCA/caso
Homepage: https://github.com/IFCA-Advanced-Computing/caso
Build-Depends:
debhelper (>= 7.0.50),
dh-python,
Expand Down
4 changes: 3 additions & 1 deletion packaging/redhat/caso.spec
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
Name: caso
Version: %{version}
Release: 1%{?dist}
Summary: cASO is an OpenStack Accounting extractor

License: ASL 2.0
URL: https://github.com/IFCA/caso
URL: https://github.com/IFCA-Advanced-Computing/caso
Source0: https://github.com/IFCA-Advanced-Computing/caso/archive/v%{version}/caso-%{version}.tar.gz

BuildArch: noarch
BuildRequires: python3-devel
Expand Down