colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab: drop the autotools jobs

Browse Source 
As we are dropping autotools in 1.50, we can drop the autotools jobs. It
would also help to lower the load on freedesktop pipeline.
This commit is contained in:
Fernando Fernandez Mancera
2024-05-29 15:28:21 +02:00
parent 44f7dd88af
commit dda6e9515f
3 changed files with 16 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.gitlab-ci.yml
View File

@@ -59,11 +59,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bumping # This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag". # ".default_tag".
ALPINE_TAG: 'tag-75ecbb5bcef4' ALPINE_TAG: 'tag-63a17fe29587'
CENTOS_TAG: 'tag-0de3c2e2d9ed' CENTOS_TAG: 'tag-f02bd5ca818e'
DEBIAN_TAG: 'tag-1ccef04c657b' DEBIAN_TAG: 'tag-7818bbf1d226'
FEDORA_TAG: 'tag-0de3c2e2d9ed' FEDORA_TAG: 'tag-f02bd5ca818e'
UBUNTU_TAG: 'tag-1ccef04c657b' UBUNTU_TAG: 'tag-7818bbf1d226'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -342,13 +342,9 @@ t_fedora:40:
parallel: parallel:
matrix: matrix:
- NM_TEST_SELECT_RUN: - NM_TEST_SELECT_RUN:
- autotools+gcc+docs+valgrind
- meson+gcc+docs+valgrind - meson+gcc+docs+valgrind
- autotools+clang
- meson+clang - meson+clang
- rpm+autotools
- rpm+meson - rpm+meson
- tarball+autotools
- tarball+meson - tarball+meson
- tarball - tarball
- subtree - subtree
@@ -369,13 +365,9 @@ t_fedora:rawhide:
parallel: parallel:
matrix: matrix:
- NM_TEST_SELECT_RUN: - NM_TEST_SELECT_RUN:
- autotools+gcc+docs+valgrind
- meson+gcc+docs+valgrind - meson+gcc+docs+valgrind
- autotools+clang
- meson+clang - meson+clang
- rpm+autotools
- rpm+meson - rpm+meson
- tarball+autotools
- tarball+meson - tarball+meson
- tarball - tarball
- subtree - subtree
@@ -396,13 +388,9 @@ t_centos:stream9:
parallel: parallel:
matrix: matrix:
- NM_TEST_SELECT_RUN: - NM_TEST_SELECT_RUN:
- autotools+gcc+docs+valgrind
- meson+gcc+docs+valgrind - meson+gcc+docs+valgrind
- autotools+clang
- meson+clang - meson+clang
- rpm+autotools
- rpm+meson - rpm+meson
- tarball+autotools
- tarball+meson - tarball+meson
- tarball - tarball
- subtree - subtree
@@ -650,9 +638,9 @@ pages:
when: never when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main' - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
dependencies: dependencies:
- "t_fedora:40: [autotools+gcc+docs+valgrind]" - "t_fedora:40: [meson+gcc+docs+valgrind]"
needs: needs:
- "t_fedora:40: [autotools+gcc+docs+valgrind]" - "t_fedora:40: [meson+gcc+docs+valgrind]"
# triage:issues: # triage:issues:
# stage: triage # stage: triage

8
.gitlab-ci/ci.template
View File

@@ -156,13 +156,9 @@ t_{{distro.name}}:{{version}}:
parallel: parallel:
matrix: matrix:
- NM_TEST_SELECT_RUN: - NM_TEST_SELECT_RUN:
- autotools+gcc+docs+valgrind
- meson+gcc+docs+valgrind - meson+gcc+docs+valgrind
- autotools+clang
- meson+clang - meson+clang
- rpm+autotools
- rpm+meson - rpm+meson
- tarball+autotools
- tarball+meson - tarball+meson
- tarball - tarball
- subtree - subtree
@@ -237,9 +233,9 @@ pages:
when: never when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main' - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
dependencies: dependencies:
- "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [autotools+gcc+docs+valgrind]" - "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [meson+gcc+docs+valgrind]"
needs: needs:
- "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [autotools+gcc+docs+valgrind]" - "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [meson+gcc+docs+valgrind]"
# triage:issues: # triage:issues:
# stage: triage # stage: triage

56
.gitlab-ci/run-test.sh
View File

@@ -57,13 +57,9 @@ check_run_assert() {
# These are the supported $NM_TEST_SELECT_RUN values. # These are the supported $NM_TEST_SELECT_RUN values.
local _CHECK_RUN_LIST=( local _CHECK_RUN_LIST=(
autotools+gcc+docs+valgrind
meson+gcc+docs+valgrind meson+gcc+docs+valgrind
autotools+clang
meson+clang meson+clang
rpm+autotools
rpm+meson rpm+meson
tarball+autotools
tarball+meson tarball+meson
tarball tarball
subtree subtree
@@ -110,17 +106,13 @@ check_run_clean() {
return 0 return 0
} }
if check_run_clean autotools+gcc+docs+valgrind ; then if check_run_clean meson+gcc+docs+valgrind ; then
BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh BUILD_TYPE=meson CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh
mv build/INST/share/gtk-doc/html "$ARTIFACT_DIR/docs-html" mv INST/share/gtk-doc/html "$ARTIFACT_DIR/docs-html"
fi fi
check_run_clean meson+gcc+docs+valgrind && BUILD_TYPE=meson CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh check_run_clean meson+clang && BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
check_run_clean autotools+clang && BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh check_run_clean rpm+meson && test $IS_FEDORA = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson
check_run_clean meson+clang && BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
check_run_clean rpm+autotools && test $IS_FEDORA = 1 -o $IS_CENTOS = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -W meson
check_run_clean rpm+meson && test $IS_FEDORA = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson
if check_run_clean tarball && [ "$NM_BUILD_TARBALL" = 1 ]; then if check_run_clean tarball && [ "$NM_BUILD_TARBALL" = 1 ]; then
SIGN_SOURCE=0 ./contrib/fedora/rpm/build_clean.sh -r SIGN_SOURCE=0 ./contrib/fedora/rpm/build_clean.sh -r
@@ -129,41 +121,7 @@ if check_run_clean tarball && [ "$NM_BUILD_TARBALL" = 1 ]; then
do_clean do_clean
fi fi
if check_run_clean tarball+autotools; then check_run_clean tarball+meson && BUILD_TYPE=meson CC=gcc WITH_DOCS=1 CONFIGURE_ONLY=1 contrib/scripts/nm-ci-run.sh
BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 CONFIGURE_ONLY=1 contrib/scripts/nm-ci-run.sh
pushd ./build
# dist & build with autotools
make distcheck -j$(nproc)
# build with meson
DISTSRC="./distsrc-$RANDOM"
mkdir $DISTSRC
tar xvf ./NetworkManager-1*.tar.xz -C $DISTSRC --strip-components=1
pushd $DISTSRC
BUILD_TYPE=meson CC=gcc WITH_DOCS=1 ../../contrib/scripts/nm-ci-run.sh
popd
popd
do_clean
fi
if check_run_clean tarball+meson; then
BUILD_TYPE=meson CC=gcc WITH_DOCS=1 CONFIGURE_ONLY=1 contrib/scripts/nm-ci-run.sh
pushd ./build
# dist with meson/ninja
ninja dist
# build with autotools
DISTSRC="./distsrc-$RANDOM"
mkdir $DISTSRC
tar xvf ./meson-dist/NetworkManager-1*.tar.xz -C $DISTSRC --strip-components=1
pushd $DISTSRC
BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 ../../contrib/scripts/nm-ci-run.sh
popd
rm -rf $DISTSRC
popd
do_clean
fi
############################################################################### ###############################################################################
@@ -202,7 +160,7 @@ fi
if [ "$NM_BUILD_TARBALL" = 1 ]; then if [ "$NM_BUILD_TARBALL" = 1 ]; then
do_clean do_clean
if check_run autotools+gcc+docs+valgrind ; then if check_run meson+gcc+docs+valgrind ; then
mv "$ARTIFACT_DIR/docs-html/" ./ mv "$ARTIFACT_DIR/docs-html/" ./
fi fi
if check_run tarball ; then if check_run tarball ; then