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.

Sign up for GitHub

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

Jump to bottom

gitea: include "options" directory in "data" output #49408

Merged
merged 1 commit into from Oct 29, 2018
Merged

gitea: include "options" directory in "data" output #49408

merged 1 commit into from Oct 29, 2018

Conversation

pvgoran
Copy link
Contributor

@pvgoran pvgoran commented Oct 29, 2018

This directory contains template files needed for initializing new repositories.

Fixes #49404.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@pvgoran
gitea: include "options" directory in "data" output
5f3054e 
This directory contains template files needed for initializing new repositories.

Fixes NixOS#49404.
@markuskowa
Copy link
Member

@GrahamcOfBorg build gitea

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitea

Partial log (click to expand)

checking for references to /build in /nix/store/z5ramcyq6ziy49wq7sdslf5jwn66y6lb-gitea-1.5.2-bin...
shrinking RPATHs of ELF executables and libraries in /nix/store/801jg5axybzpdncq48nya4wfmx4a68wq-gitea-1.5.2
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/801jg5axybzpdncq48nya4wfmx4a68wq-gitea-1.5.2
checking for references to /build in /nix/store/801jg5axybzpdncq48nya4wfmx4a68wq-gitea-1.5.2...
shrinking RPATHs of ELF executables and libraries in /nix/store/0l10j6aajqh77vwld7ra7p7ypais6inq-gitea-1.5.2-data
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/0l10j6aajqh77vwld7ra7p7ypais6inq-gitea-1.5.2-data
checking for references to /build in /nix/store/0l10j6aajqh77vwld7ra7p7ypais6inq-gitea-1.5.2-data...
/nix/store/z5ramcyq6ziy49wq7sdslf5jwn66y6lb-gitea-1.5.2-bin

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: gitea

Partial log (click to expand)

code.gitea.io/gitea/models
code.gitea.io/gitea/modules/notification
code.gitea.io/gitea/modules/templates
code.gitea.io/gitea/modules/auth
code.gitea.io/gitea/modules/context
code.gitea.io/gitea/modules/lfs
code.gitea.io/gitea/routers/repo
code.gitea.io/gitea/routers/user
builder for '/nix/store/x63gclfvhydpn6dhmbrzzcyf2in5l00y-gitea-1.5.2.drv' failed with exit code 40
error: build of '/nix/store/x63gclfvhydpn6dhmbrzzcyf2in5l00y-gitea-1.5.2.drv' failed

@markuskowa
Copy link
Member

@GrahamcOfBorg build gitea

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitea

Partial log (click to expand)

/nix/store/z5ramcyq6ziy49wq7sdslf5jwn66y6lb-gitea-1.5.2-bin

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: gitea

Partial log (click to expand)

        /nix/store/r2v4zhhdlgakyjj902lrykdzchwvahh6-go-1.11/share/go/src/cmd/compile/internal/gc/main.go:628 +0x25cc fp=0x400056bf20 sp=0x400056b890 pc=0x5ee20c
main.main()
        /nix/store/r2v4zhhdlgakyjj902lrykdzchwvahh6-go-1.11/share/go/src/cmd/compile/main.go:51 +0x8c fp=0x400056bf90 sp=0x400056bf20 pc=0x6e655c
runtime.main()
        /nix/store/r2v4zhhdlgakyjj902lrykdzchwvahh6-go-1.11/share/go/src/runtime/proc.go:201 +0x204 fp=0x400056bfd0 sp=0x400056bf90 pc=0x39614
runtime.goexit()
        /nix/store/r2v4zhhdlgakyjj902lrykdzchwvahh6-go-1.11/share/go/src/runtime/asm_arm64.s:1114 +0x4 fp=0x400056bfd0 sp=0x400056bfd0 pc=0x61f34
code.gitea.io/gitea/vendor/github.com/RoaringBitmap/roaring
builder for '/nix/store/x63gclfvhydpn6dhmbrzzcyf2in5l00y-gitea-1.5.2.drv' failed with exit code 46
error: build of '/nix/store/x63gclfvhydpn6dhmbrzzcyf2in5l00y-gitea-1.5.2.drv' failed

@markuskowa
Copy link
Member

builder issue on aarch64 is unrelated to this PR (#48128)

@markuskowa markuskowa merged commit b07e8ff into NixOS:master Oct 29, 2018
@pvgoran
Copy link
Contributor Author

pvgoran commented Nov 23, 2018

How about adding this to 18.09? @markuskowa?

@markuskowa
Copy link
Member

It is a simple bug fix, so I would say yes to backporting this.
@Mic92 does this qualify for a backport?

@Mic92
Copy link
Member

Mic92 commented Nov 24, 2018

@markus1189 yes.

@markuskowa
Copy link
Member

cherry picked for release-18.09 5c1cf68

@pvgoran
Copy link
Contributor Author

pvgoran commented Nov 28, 2018

@markuskowa Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pvgoran @markuskowa @GrahamcOfBorg @Mic92