Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ostree: 2020.2 -> 2020.3 #82698

Merged
merged 1 commit into from Mar 16, 2020
Merged

ostree: 2020.2 -> 2020.3 #82698

merged 1 commit into from Mar 16, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Mar 15, 2020

https://github.com/ostreedev/ostree/releases/tag/v2020.3

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @jtojnar

Copy link
Contributor

@JeffLabonte JeffLabonte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When building with nixpkg-review, gnome-builder fails to build:

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/jflabonte/.cache/nixpkgs-review/pr-82698/build.nix
builder for '/nix/store/5pn64ygch3w29lfwhacyq5qjlgrcwkfq-gnome-builder-3.34.1.drv' failed with exit code 1; last 10 log lines:
  /nix/store/1wb31gzrjw055xl6d3igzj1gnajzlwbk-gcc-wrapper-9.2.0/bin/cc -Isrc/plugins/git/daemon/3185d7c@@gnome-builder-git@exe -Isrc/plugins/git/daemon -I../src/plugins/git/daemon -I/nix/store/5mj5kkymfnkfdw6956n8nwxbxharcv8d-glib-2.62.5-dev/include/gio-unix-2.0 -I/nix/store/5mj5kkymfnkfdw6956n8nwxbxharcv8d-glib-2.62.5-dev/include -I/nix/store/5mj5kkymfnkfdw6956n8nwxbxharcv8d-glib-2.62.5-dev/include/glib-2.0 -I/nix/store/56rgn6k5vc151lhxwl8ghnbbk80yghj3-glib-2.62.5/lib/glib-2.0/include -I/nix/store/ln9dh808z3025hym62cg08dd0vbdvj84-libgit2-glib-0.99.0.1/include/libgit2-glib-1.0 -I/nix/store/mqp9bai8f37flvah86arp81cxh60y01i-libgit2-0.99.0/include -I/build/gnome-builder-3.34.1/build -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu11 -Wcast-align -Wdeclaration-after-statement -Werror=address -Werror=array-bounds -Werror=empty-body -Werror=implicit -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=init-self -Werror=int-conversion -Werror=int-to-pointer-cast -Werror=main -Werror=misleading-indentation -Werror=missing-braces -Werror=missing-include-dirs -Werror=nonnull -Werror=overflow -Werror=pointer-arith -Werror=pointer-to-int-cast -Werror=redundant-decls -Werror=return-type -Werror=sequence-point -Werror=shadow -Werror=strict-prototypes -Werror=trigraphs -Werror=undef -Werror=write-strings -Wformat-nonliteral -Werror=format-security -Werror=format=2 -Wignored-qualifiers -Wimplicit-function-declaration -Wlogical-op -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wno-cast-function-type -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-parameter -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wswitch-default -Wswitch-enum -Wundef -Wuninitialized -Wunused -fno-strict-aliasing -DHAVE_CONFIG_H -D_GNU_SOURCE -DIDE_COMPILATION -DG_DISABLE_CAST_CHECKS -DGIT_SSH=1 -MD -MQ 'src/plugins/git/daemon/3185d7c@@gnome-builder-git@exe/ipc-git-repository-impl.c.o' -MF 'src/plugins/git/daemon/3185d7c@@gnome-builder-git@exe/ipc-git-repository-impl.c.o.d' -o 'src/plugins/git/daemon/3185d7c@@gnome-builder-git@exe/ipc-git-repository-impl.c.o' -c ../src/plugins/git/daemon/ipc-git-repository-impl.c
  In file included from /nix/store/mqp9bai8f37flvah86arp81cxh60y01i-libgit2-0.99.0/include/git2.h:69,
                   from /nix/store/ln9dh808z3025hym62cg08dd0vbdvj84-libgit2-glib-0.99.0.1/include/libgit2-glib-1.0/libgit2-glib/ggit-annotated-commit.h:26,
                   from /nix/store/ln9dh808z3025hym62cg08dd0vbdvj84-libgit2-glib-0.99.0.1/include/libgit2-glib-1.0/libgit2-glib/ggit.h:24,
                   from ../src/plugins/git/daemon/ipc-git-repository-impl.c:23:
  ../src/plugins/git/daemon/ipc-git-repository-impl.c:36:5: error: token ""0.99"" is not valid in preprocessor expressions
     36 | #if LIBGIT2_SOVERSION >= 28
        |     ^~~~~~~~~~~~~~~~~
  [587/1140] Compiling C object 'src/plugins/git/daemon/3185d7c@@test-git@exe/meson-generated_.._ipc-git-repository.c.o'..
  ninja: build stopped: subcommand failed.
cannot build derivation '/nix/store/8n73drakc6klhr514annbib7ljw5fh0k-env.drv': 1 dependencies couldn't be built
[25 built (1 failed), 791 copied (6554.0 MiB), 1029.7 MiB DL]
error: build of '/nix/store/8n73drakc6klhr514annbib7ljw5fh0k-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/82698
1 package failed to build:
gnome-builder

13 package built:
discover flatpak flatpak-builder gnome3.gnome-software haskellPackages.gi-ostree malcontent minishift ostree pantheon.appcenter pantheon.sideload rpm-ostree xdg-desktop-portal xdg-desktop-portal-gtk

$ nix-shell /home/jflabonte/.cache/nixpkgs-review/pr-82698/shell.nix

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Jeff for checking. The gnome-builder failure looks unrelated and hopefully will be fixed by #81626.

$ env TEST_SKIP_CLEANUP=1 OT_TESTS_DEBUG=1 nix run -f . gnome-desktop-testing ostree -c gnome-desktop-testing-runner -d $(nix-build -A ostree.installedTests --no-out-link)/share -t 1800
[…]
SUMMARY: total=109; passed=109; skipped=0; failed=0; user=141.0s; system=74.5s; maxrss=115880

@jtojnar jtojnar merged commit a077102 into NixOS:master Mar 16, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Mar 16, 2020

Thanks for the update.

@zowoq zowoq deleted the ostree branch March 16, 2020 03:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants