mirror of
https://github.com/openSUSE/osc.git
synced 2024-12-25 17:36:13 +01:00
Merge pull request #1177 from dmach/fix-_private
Include osc._private in setup.cfg
This commit is contained in:
commit
2b20969300
22
.github/workflows/build-install.yaml
vendored
22
.github/workflows/build-install.yaml
vendored
@ -55,7 +55,7 @@ jobs:
|
||||
zypper --non-interactive install git-lfs rpm-build
|
||||
|
||||
- name: 'Install packages (Fedora/CentOS)'
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
run: |
|
||||
dnf -y makecache
|
||||
dnf -y distro-sync
|
||||
@ -71,7 +71,7 @@ jobs:
|
||||
zypper --non-interactive install $(rpmspec -q --buildrequires contrib/osc.spec)
|
||||
|
||||
- name: 'Install build dependencies (Fedora/CentOS)'
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
run: |
|
||||
dnf -y builddep contrib/osc.spec
|
||||
|
||||
@ -84,6 +84,20 @@ jobs:
|
||||
|
||||
./contrib/build_rpm.py --srpm --rpm
|
||||
|
||||
- name: 'Install built RPMs (OpenSUSE)'
|
||||
if: ${{ startsWith(matrix.container, 'opensuse/') }}
|
||||
run: |
|
||||
zypper --non-interactive install --force --allow-vendor-change --allow-unsigned-rpm ./contrib/*/*.rpm
|
||||
|
||||
- name: 'Install build RPMs (Fedora/CentOS)'
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
run: |
|
||||
dnf -y install ./contrib/*/*.rpm
|
||||
|
||||
- name: 'Run installed osc'
|
||||
run: |
|
||||
osc --help
|
||||
|
||||
pip:
|
||||
name: 'pip install test'
|
||||
runs-on: 'ubuntu-latest'
|
||||
@ -102,3 +116,7 @@ jobs:
|
||||
- name: 'Install osc from pip'
|
||||
run: |
|
||||
pip3 install .
|
||||
|
||||
- name: 'Run installed osc'
|
||||
run: |
|
||||
osc --help
|
||||
|
4
.github/workflows/unittests.yaml
vendored
4
.github/workflows/unittests.yaml
vendored
@ -60,7 +60,7 @@ jobs:
|
||||
zypper -n install diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
|
||||
|
||||
- name: 'Install packages (Fedora/CentOS)'
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }}
|
||||
run: |
|
||||
dnf -y makecache
|
||||
dnf -y distro-sync
|
||||
@ -68,7 +68,7 @@ jobs:
|
||||
dnf -y install diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
|
||||
|
||||
- name: 'Install packages (Debian/Ubuntu)'
|
||||
if: ${{ startsWith(matrix.container, 'debian:') || startsWith(matrix.container, 'ubuntu:') }}
|
||||
if: ${{ startsWith(matrix.container, 'debian:') || startsWith(matrix.container, 'ubuntu:') }}
|
||||
run: |
|
||||
apt-get -y update
|
||||
apt-get -y upgrade
|
||||
|
@ -100,6 +100,7 @@ class Spec:
|
||||
self.path,
|
||||
"--define", f"_sourcedir {self.topdir}",
|
||||
"--define", f"_srcrpmdir {self.topdir}",
|
||||
"--define", f"_rpmdir {self.topdir}",
|
||||
]
|
||||
if srpm and rpm:
|
||||
cmd.append("-ba")
|
||||
|
Loading…
Reference in New Issue
Block a user