packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2608 from cgwalters/fanalyzer-fixes 

ci: Drop gcc `-fanalyzer` by default
This commit is contained in:
Colin Walters 2022-05-16 15:55:35 -04:00 committed by GitHub
parent 39a953dfa5 87cf46bbd9
commit 2106f12637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cci.jenkinsfile
View File

@ -3,7 +3,7 @@
stage("Build") { stage("Build") {
parallel normal: { parallel normal: {
def n = 5 def n = 5
buildPod(runAsUser:0, memory: "2Gi", cpu: "${n}") { buildPod(memory: "2Gi", cpu: "${n}") {
checkout scm checkout scm
stage("Core build") { stage("Core build") {
shwrap(""" shwrap("""
@ -39,7 +39,7 @@ parallel normal: {
}, },
// A minimal build, helps test our build options // A minimal build, helps test our build options
minimal: { minimal: {
buildPod(runAsUser:0) { buildPod() {
checkout scm checkout scm
shwrap(""" shwrap("""
git submodule update --init git submodule update --init
@ -54,7 +54,7 @@ minimal: {
} }
}, },
codestyle: { codestyle: {
buildPod(runAsUser:0) { buildPod() {
checkout scm checkout scm
shwrap(""" shwrap("""
# Jenkins by default only fetches the branch it's testing. Explicitly fetch main # Jenkins by default only fetches the branch it's testing. Explicitly fetch main

2
ci/build.sh
View File

@ -30,6 +30,6 @@ esac
# always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
# NB: this disables the default set of flags from configure.ac # NB: this disables the default set of flags from configure.ac
export CFLAGS="-Wall -Werror -fanalyzer ${CFLAGS:-}" export CFLAGS="-Wall -Werror ${CFLAGS:-}"
build --enable-gtk-doc ${CONFIGOPTS:-} build --enable-gtk-doc ${CONFIGOPTS:-}

9
src/libostree/ostree-sysroot.c
View File

@ -1267,7 +1267,7 @@ ostree_sysroot_get_booted_deployment (OstreeSysroot *self)
OstreeDeployment * OstreeDeployment *
ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error) ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
if (!self->booted_deployment) if (!self->booted_deployment)
return glnx_null_throw (error, "Not currently booted into an OSTree system"); return glnx_null_throw (error, "Not currently booted into an OSTree system");
@ -1286,7 +1286,7 @@ ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error)
OstreeDeployment * OstreeDeployment *
ostree_sysroot_get_staged_deployment (OstreeSysroot *self) ostree_sysroot_get_staged_deployment (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
return self->staged_deployment; return self->staged_deployment;
} }
@ -1300,7 +1300,7 @@ ostree_sysroot_get_staged_deployment (OstreeSysroot *self)
GPtrArray * GPtrArray *
ostree_sysroot_get_deployments (OstreeSysroot *self) ostree_sysroot_get_deployments (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
GPtrArray *copy = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref); GPtrArray *copy = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
for (guint i = 0; i < self->deployments->len; i++) for (guint i = 0; i < self->deployments->len; i++)
@ -1525,7 +1525,7 @@ ostree_sysroot_query_deployments_for (OstreeSysroot *self,
OstreeDeployment **out_pending, OstreeDeployment **out_pending,
OstreeDeployment **out_rollback) OstreeDeployment **out_rollback)
{ {
g_return_if_fail (osname != NULL || self->booted_deployment != NULL); g_assert (osname != NULL || self->booted_deployment != NULL);
g_autoptr(OstreeDeployment) ret_pending = NULL; g_autoptr(OstreeDeployment) ret_pending = NULL;
g_autoptr(OstreeDeployment) ret_rollback = NULL; g_autoptr(OstreeDeployment) ret_rollback = NULL;
@ -1896,6 +1896,7 @@ ostree_sysroot_simple_write_deployment (OstreeSysroot *sysroot,
/* tracks when we come across the booted deployment */ /* tracks when we come across the booted deployment */
gboolean before_booted = TRUE; gboolean before_booted = TRUE;
gboolean before_merge = TRUE; gboolean before_merge = TRUE;
g_assert (deployments);
for (guint i = 0; i < deployments->len; i++) for (guint i = 0; i < deployments->len; i++)
{ {
OstreeDeployment *deployment = deployments->pdata[i]; OstreeDeployment *deployment = deployments->pdata[i];