diff options
| author | Joseph Marrero Corchado <jmarrero@users.noreply.github.com> | 2023-04-26 10:50:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 10:50:50 -0400 |
| commit | 9c548d832ce78bdd5a1611d9081c203f617ad821 (patch) | |
| tree | fe31faaab0a799fc6d61686faf2e7f423d9dac1a | |
| parent | 90f7c7bd9f98ebcdff81e0363a4d0117b876d5c3 (diff) | |
| parent | 64aa5af2360985346c5c25c07f01225eebd445c4 (diff) | |
| download | ostree-9c548d832ce78bdd5a1611d9081c203f617ad821.tar.gz | |
Merge pull request #2850 from cgwalters/ci-no-error-deprecated-declarations
ci: Turn off errors for deprecated-declarations
| -rwxr-xr-x | ci/build-check.sh | 2 | ||||
| -rwxr-xr-x | ci/build.sh | 2 | ||||
| -rw-r--r-- | ci/libbuild.sh | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/ci/build-check.sh b/ci/build-check.sh index aed8ba7e..716052c1 100755 --- a/ci/build-check.sh +++ b/ci/build-check.sh @@ -25,7 +25,7 @@ if test -x /usr/bin/clang; then if grep -q -e 'static inline.*_GLIB_AUTOPTR_LIST_FUNC_NAME' /usr/include/glib-2.0/glib/gmacros.h; then echo 'Skipping clang check, see https://bugzilla.gnome.org/show_bug.cgi?id=796346' else - export CFLAGS="-Wall -Werror ${CFLAGS:-}" + export CFLAGS="-Wall -Werror -Wno-error=deprecated-declarations ${CFLAGS:-}" git clean -dfx && git submodule foreach git clean -dfx export CC=clang build diff --git a/ci/build.sh b/ci/build.sh index 2afcd018..48605658 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -30,6 +30,6 @@ esac # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # NB: this disables the default set of flags from configure.ac -export CFLAGS="-Wall -Werror ${CFLAGS:-}" +export CFLAGS="-Wall -Werror -Wno-error=deprecated-declarations ${CFLAGS:-}" build --enable-gtk-doc ${CONFIGOPTS:-} diff --git a/ci/libbuild.sh b/ci/libbuild.sh index ffc65585..9938e282 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -36,11 +36,6 @@ pkg_install_if_os() { pkg_install_buildroot() { case "${OS_ID}" in fedora) - # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89 - # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups - if rpm -q fedora-release-container; then - dnf -y swap fedora-release{-container,} - fi pkg_install dnf-plugins-core @buildsys-build;; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; esac |