Skip to content

Commit

Permalink
Create v1-only branch
Browse files Browse the repository at this point in the history
This branch will be maintenance-only for libmodulemd 1.x.

This patch drops all v2 code from the tree and reworks the
build system and CI tests for this branch.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
  • Loading branch information
sgallagher committed Jul 24, 2019
1 parent 073fc5d commit 2d46172
Show file tree
Hide file tree
Showing 232 changed files with 464 additions and 76,184 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
script: ./.travis/travis-fedora.sh
- name: "CentOS 7"
script: ./.travis/travis-centos.sh
- name: "Documentation Update"
script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./.travis/travis-docs.sh; fi'
- name: "Coverity Scan"
script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./.travis/travis-coverity.sh; fi'
- name: "openSUSE tumbleweed"
script: ./.travis/travis-opensuse.sh
- name: "Arch Linux"
Expand Down
4 changes: 1 addition & 3 deletions .travis/archlinux/travis-tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=false -Ddeveloper_build=false -Dpython_name=

pushd /builddir/

# Build the v1 and v2 code under GCC and run standard tests
# Build the code under GCC and run standard tests
meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
travis

Expand Down
4 changes: 1 addition & 3 deletions .travis/centos/travis-tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=false -Ddeveloper_build=false -Dpython_name=

pushd /builddir/

# Build the v1 and v2 code under GCC and run standard tests
# Build the code under GCC and run standard tests
meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
travis

Expand Down
14 changes: 0 additions & 14 deletions .travis/coverity/Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions .travis/coverity/travis-tasks.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .travis/coverity_prep.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .travis/docs/Dockerfile

This file was deleted.

56 changes: 0 additions & 56 deletions .travis/docs/travis-tasks.sh

This file was deleted.

65 changes: 4 additions & 61 deletions .travis/fedora/travis-tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=${DIRTY_REPO_CHECK:-true}"

pushd /builddir/

# Build the v1 and v2 code under GCC and run standard tests
# Build the code under GCC and run standard tests
meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
travis

Expand All @@ -32,34 +30,11 @@ if [ $ret != 0 ]; then
fi
set -e

# Test the v2 code with clang-analyzer
# This requires meson 0.49.0 or later
set +e
rpmdev-vercmp `meson --version` 0.49.0
if [ $? -eq 12 ]; then
# Meson was older than 0.49.0, skip this step
echo "Meson is too old to run scan-build"
set -e
else
set -e
meson --buildtype=debug \
-Dbuild_api_v1=false \
-Dbuild_api_v2=true \
-Dskip_introspection=true \
$COMMON_MESON_ARGS \
travis_scanbuild

pushd travis_scanbuild
/builddir/.travis/scanbuild.sh
popd #travis_scanbuild
fi


# Always install and run the installed RPM tests last so we don't pollute the
# testing environment above.

meson --buildtype=debug \
-Dbuild_api_v1=true \
$COMMON_MESON_ARGS \
build_rpm

Expand All @@ -86,47 +61,15 @@ dnf -y install --nogpgcheck \
popd #build_rpm

meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=false \
-Dtest_installed_lib=true \
$COMMON_MESON_ARGS \
installed_lib_tests_v1

pushd installed_lib_tests_v1

# Run the tests against the installed RPMs
ninja test

popd #installed_lib_tests_v1


pushd build_rpm
installed_lib_tests

dnf -y install --nogpgcheck \
--allowerasing \
--repofrompath libmodulemd-travis,rpmbuild/RPMS \
python3-libmodulemd \
"libmodulemd-devel > 2"

# Also install the python2-libmodulemd if it was built for this release
# the ||: at the end instructs bash to consider this a pass either way.
dnf -y install --nogpgcheck \
--allowerasing \
--repofrompath libmodulemd-travis,rpmbuild/RPMS \
python2-libmodulemd ||:
popd

meson --buildtype=debug \
-Dbuild_api_v1=false \
-Dbuild_api_v2=true \
-Dtest_installed_lib=true \
$COMMON_MESON_ARGS \
installed_lib_tests_v2
pushd installed_lib_tests

pushd installed_lib_tests_v2
# Run the tests against the installed RPMs
ninja test

popd #installed_lib_tests_v2
popd #installed_lib_tests

popd #builddir
32 changes: 1 addition & 31 deletions .travis/mageia/travis-tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=${DIRTY_REPO_CHECK:-true}"

pushd /builddir/

# Build the v1 and v2 code under GCC and run standard tests
# Build the code under GCC and run standard tests
meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
travis

Expand All @@ -34,31 +32,3 @@ if [ $? != 0 ]; then
fi
set -e

# Test the v2 code with clang-analyzer
# This requires meson 0.49.0 or later
set +e
rpmdev-vercmp `meson --version` 0.49.0
if [ $? -eq 12 ]; then
# Meson was older than 0.49.0, skip this step
echo "Meson is too old to run scan-build"
set -e
else
set -e
meson --buildtype=debug \
-Dbuild_api_v1=false \
-Dbuild_api_v2=true \
-Dskip_introspection=true \
$COMMON_MESON_ARGS \
travis_scanbuild

pushd travis_scanbuild
/builddir/.travis/scanbuild.sh
popd #travis_scanbuild
fi

meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
coverity

4 changes: 1 addition & 3 deletions .travis/opensuse/travis-tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=false -Ddeveloper_build=false -Dpython_name=

pushd /builddir/

# Build the v1 and v2 code under GCC and run standard tests
# Build the code under GCC and run standard tests
meson --buildtype=debug \
-Dbuild_api_v1=true \
-Dbuild_api_v2=true \
$COMMON_MESON_ARGS \
travis

Expand Down
20 changes: 0 additions & 20 deletions .travis/scanbuild.sh

This file was deleted.

49 changes: 0 additions & 49 deletions .travis/travis-coverity.sh

This file was deleted.

Loading

0 comments on commit 2d46172

Please sign in to comment.