Skip to content
Open
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
29 changes: 0 additions & 29 deletions .copr/Makefile

This file was deleted.

100 changes: 100 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
---
name: build

on:
push:
branches: [master]
tags: ['*']
pull_request:
branches: [master]
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- name: almalinux-9
shortcut: el9
container-name: almalinux9
- name: almalinux-10
shortcut: el10
container-name: almalinux10
- name: centos-stream-9
shortcut: el9s
container-name: el9stream
- name: centos-stream-10
shortcut: el10s
container-name: el10stream

name: Build and test on ${{ matrix.name }}
container:
image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }}

steps:
- name: Checkout sources
uses: actions/checkout@v7

- name: Mark repository as safe
run: git config --global --add safe.directory "$(pwd)"

- name: Install dependencies
run: |
dnf install -y epel-release
dnf config-manager --set-enabled epel || true
dnf install -y autoconf automake gcc gettext-devel git libtool make rpm-build \
python3-devel python3-pyflakes python3-pycodestyle python3-coverage \
rpm-sign createrepo_c dnf-plugin-versionlock dnf-utils makeself

- name: Set build environment
run: |
TAG=$(git tag --points-at HEAD | head -1)
if [[ -n "$TAG" ]]; then
if [[ "$TAG" =~ -([0-9]+)$ ]]; then
echo "PACKAGE_RPM_RELEASE=${BASH_REMATCH[1]}" >> $GITHUB_ENV
else
echo "PACKAGE_RPM_RELEASE=1" >> $GITHUB_ENV
fi
else
echo "RELEASE_SUFFIX=.$(date --utc +%Y%m%d%H%M%S).git$(git rev-parse --short HEAD)" >> $GITHUB_ENV
fi

- name: Autopoint
run: autopoint

- name: Autoreconf
run: autoreconf -ivf

- name: Configure
run: ./configure

- name: Run distcheck
run: make -j distcheck

- name: Build RPM
run: make -j rpm

- name: Collect artifacts
run: |
mkdir -p exported-artifacts
find tmp.repos -iname \*rpm -exec mv "{}" exported-artifacts/ \;
mv ./*tar.gz exported-artifacts/

- name: Run checks
run: automation/run-checks.sh

- name: Upload artifacts
uses: actions/upload-artifact@v7
with:
name: rpm-${{ matrix.shortcut }}
path: exported-artifacts

publish-rpms:
permissions:
artifact-metadata: read
needs: build
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
uses: ovirt/ovirt-workflows/.github/workflows/publish-rpms.yml@main
secrets: inherit
69 changes: 0 additions & 69 deletions .github/workflows/check-patch.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,5 @@ intl
src/otopi/config.py
src/otopi/config.py.in
target
automation/config.sh
m4/extern-inline.m4

# Not autogenerated!
\!.copr/Makefile
18 changes: 18 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
AUTOMAKE_OPTIONS = foreign 1.9
ACLOCAL_AMFLAGS = -I m4

TMPREPOS = tmp.repos
RPMBUILD_ARGS := --define="_topdir `pwd`/$(TMPREPOS)"
RPMBUILD_ARGS += $(if $(RELEASE_SUFFIX),--define="release_suffix $(RELEASE_SUFFIX)")

MAINTAINERCLEANFILES = \
config.log config.status \
$(srcdir)/Makefile.in \
Expand Down Expand Up @@ -68,3 +72,17 @@ POTFILES.in:

update-po: POTFILES.in
$(MAKE) -C po update-po

rpm: srpm
rpmbuild $(RPMBUILD_ARGS) --rebuild "$(TMPREPOS)"/SRPMS/*.src.rpm
@echo
@echo "rpm available at '$(TMPREPOS)'"
@echo

srpm: dist
rm -rf "$(TMPREPOS)"
mkdir -vp $(TMPREPOS)/{SPECS,RPMS,SRPMS,SOURCES}
rpmbuild $(RPMBUILD_ARGS) -ts $(distdir).tar.gz
@echo
@echo "srpm available at '$(TMPREPOS)'"
@echo
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# otopi -- oVirt Task Oriented Pluggable Installer/Implementation
[![Copr build status](https://copr.fedorainfracloud.org/coprs/ovirt/ovirt-master-snapshot/package/otopi/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/ovirt/ovirt-master-snapshot/package/otopi/)

Standalone plugin based installation framework to be used to setup
system components. The plugin nature provides simplicity to
Expand Down
1 change: 0 additions & 1 deletion automation/build-artifacts-manual.packages

This file was deleted.

1 change: 0 additions & 1 deletion automation/build-artifacts-manual.sh

This file was deleted.

11 changes: 0 additions & 11 deletions automation/build-artifacts.packages

This file was deleted.

35 changes: 0 additions & 35 deletions automation/build-artifacts.sh

This file was deleted.

26 changes: 0 additions & 26 deletions automation/build-srpm.sh

This file was deleted.

17 changes: 0 additions & 17 deletions automation/check-patch.packages

This file was deleted.

1 change: 0 additions & 1 deletion automation/check-patch.req

This file was deleted.

14 changes: 0 additions & 14 deletions automation/check-patch.sh

This file was deleted.

1 change: 0 additions & 1 deletion automation/config.sh.in

This file was deleted.

13 changes: 7 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ define([VERSION_MAJOR], [1])
define([VERSION_MINOR], [10])
define([VERSION_FIX], [6])
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
define([VERSION_SUFFIX], [_master])

AC_INIT([otopi], VERSION_NUMBER[]VERSION_SUFFIX)
AC_INIT([otopi], VERSION_NUMBER)
PACKAGE_RPM_VERSION="VERSION_NUMBER"
PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed 's/^_//')"
RELEASE_SUFFIX="VERSION_SUFFIX"

AC_ARG_VAR([PACKAGE_RPM_RELEASE],
[RPM release field (default: 0.master for development, release number for release builds)])
AS_IF([test -z "$PACKAGE_RPM_RELEASE"],
[PACKAGE_RPM_RELEASE="0.master"])

AC_SUBST([PACKAGE_RPM_VERSION])
AC_SUBST([PACKAGE_RPM_RELEASE])
AC_SUBST([RELEASE_SUFFIX])

AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR([src/otopi/__init__.py])
Expand Down Expand Up @@ -89,7 +91,6 @@ AC_CONFIG_FILES([
src/plugins/otopi/debug/test_note/Makefile
src/plugins/otopi/debug/wait_on_error/Makefile
src/plugins/otopi/debug/packages/Makefile
automation/config.sh
automation/testRPMs/testpackage1/testpackage1.spec
automation/testRPMs/testpackage2/testpackage2.spec
automation/testRPMsUpdates/testpackage1/testpackage1.spec
Expand Down
Loading