Skip to content

Commit 2d46172

Browse files
committed
Create v1-only branch
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 <[email protected]>
1 parent 073fc5d commit 2d46172

File tree

232 files changed

+464
-76184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+464
-76184
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ jobs:
3535
script: ./.travis/travis-fedora.sh
3636
- name: "CentOS 7"
3737
script: ./.travis/travis-centos.sh
38-
- name: "Documentation Update"
39-
script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./.travis/travis-docs.sh; fi'
40-
- name: "Coverity Scan"
41-
script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./.travis/travis-coverity.sh; fi'
4238
- name: "openSUSE tumbleweed"
4339
script: ./.travis/travis-opensuse.sh
4440
- name: "Arch Linux"

.travis/archlinux/travis-tasks.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=false -Ddeveloper_build=false -Dpython_name=
1515

1616
pushd /builddir/
1717

18-
# Build the v1 and v2 code under GCC and run standard tests
18+
# Build the code under GCC and run standard tests
1919
meson --buildtype=debug \
20-
-Dbuild_api_v1=true \
21-
-Dbuild_api_v2=true \
2220
$COMMON_MESON_ARGS \
2321
travis
2422

.travis/centos/travis-tasks.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=false -Ddeveloper_build=false -Dpython_name=
1818

1919
pushd /builddir/
2020

21-
# Build the v1 and v2 code under GCC and run standard tests
21+
# Build the code under GCC and run standard tests
2222
meson --buildtype=debug \
23-
-Dbuild_api_v1=true \
24-
-Dbuild_api_v2=true \
2523
$COMMON_MESON_ARGS \
2624
travis
2725

.travis/coverity/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

.travis/coverity/travis-tasks.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

.travis/coverity_prep.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.travis/docs/Dockerfile

Lines changed: 0 additions & 12 deletions
This file was deleted.

.travis/docs/travis-tasks.sh

Lines changed: 0 additions & 56 deletions
This file was deleted.

.travis/fedora/travis-tasks.sh

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=${DIRTY_REPO_CHECK:-true}"
1616

1717
pushd /builddir/
1818

19-
# Build the v1 and v2 code under GCC and run standard tests
19+
# Build the code under GCC and run standard tests
2020
meson --buildtype=debug \
21-
-Dbuild_api_v1=true \
22-
-Dbuild_api_v2=true \
2321
$COMMON_MESON_ARGS \
2422
travis
2523

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

35-
# Test the v2 code with clang-analyzer
36-
# This requires meson 0.49.0 or later
37-
set +e
38-
rpmdev-vercmp `meson --version` 0.49.0
39-
if [ $? -eq 12 ]; then
40-
# Meson was older than 0.49.0, skip this step
41-
echo "Meson is too old to run scan-build"
42-
set -e
43-
else
44-
set -e
45-
meson --buildtype=debug \
46-
-Dbuild_api_v1=false \
47-
-Dbuild_api_v2=true \
48-
-Dskip_introspection=true \
49-
$COMMON_MESON_ARGS \
50-
travis_scanbuild
51-
52-
pushd travis_scanbuild
53-
/builddir/.travis/scanbuild.sh
54-
popd #travis_scanbuild
55-
fi
56-
5733

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

6137
meson --buildtype=debug \
62-
-Dbuild_api_v1=true \
6338
$COMMON_MESON_ARGS \
6439
build_rpm
6540

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

8863
meson --buildtype=debug \
89-
-Dbuild_api_v1=true \
90-
-Dbuild_api_v2=false \
9164
-Dtest_installed_lib=true \
9265
$COMMON_MESON_ARGS \
93-
installed_lib_tests_v1
94-
95-
pushd installed_lib_tests_v1
96-
97-
# Run the tests against the installed RPMs
98-
ninja test
99-
100-
popd #installed_lib_tests_v1
101-
102-
103-
pushd build_rpm
66+
installed_lib_tests
10467

105-
dnf -y install --nogpgcheck \
106-
--allowerasing \
107-
--repofrompath libmodulemd-travis,rpmbuild/RPMS \
108-
python3-libmodulemd \
109-
"libmodulemd-devel > 2"
110-
111-
# Also install the python2-libmodulemd if it was built for this release
112-
# the ||: at the end instructs bash to consider this a pass either way.
113-
dnf -y install --nogpgcheck \
114-
--allowerasing \
115-
--repofrompath libmodulemd-travis,rpmbuild/RPMS \
116-
python2-libmodulemd ||:
117-
popd
118-
119-
meson --buildtype=debug \
120-
-Dbuild_api_v1=false \
121-
-Dbuild_api_v2=true \
122-
-Dtest_installed_lib=true \
123-
$COMMON_MESON_ARGS \
124-
installed_lib_tests_v2
68+
pushd installed_lib_tests
12569

126-
pushd installed_lib_tests_v2
12770
# Run the tests against the installed RPMs
12871
ninja test
12972

130-
popd #installed_lib_tests_v2
73+
popd #installed_lib_tests
13174

13275
popd #builddir

.travis/mageia/travis-tasks.sh

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ COMMON_MESON_ARGS="-Dtest_dirty_git=${DIRTY_REPO_CHECK:-true}"
1717

1818
pushd /builddir/
1919

20-
# Build the v1 and v2 code under GCC and run standard tests
20+
# Build the code under GCC and run standard tests
2121
meson --buildtype=debug \
22-
-Dbuild_api_v1=true \
23-
-Dbuild_api_v2=true \
2422
$COMMON_MESON_ARGS \
2523
travis
2624

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

37-
# Test the v2 code with clang-analyzer
38-
# This requires meson 0.49.0 or later
39-
set +e
40-
rpmdev-vercmp `meson --version` 0.49.0
41-
if [ $? -eq 12 ]; then
42-
# Meson was older than 0.49.0, skip this step
43-
echo "Meson is too old to run scan-build"
44-
set -e
45-
else
46-
set -e
47-
meson --buildtype=debug \
48-
-Dbuild_api_v1=false \
49-
-Dbuild_api_v2=true \
50-
-Dskip_introspection=true \
51-
$COMMON_MESON_ARGS \
52-
travis_scanbuild
53-
54-
pushd travis_scanbuild
55-
/builddir/.travis/scanbuild.sh
56-
popd #travis_scanbuild
57-
fi
58-
59-
meson --buildtype=debug \
60-
-Dbuild_api_v1=true \
61-
-Dbuild_api_v2=true \
62-
$COMMON_MESON_ARGS \
63-
coverity
64-

0 commit comments

Comments
 (0)