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

gitea: 1.2.3 -> 1.3.2 #32742

Merged
merged 1 commit into from Dec 17, 2017
Merged

gitea: 1.2.3 -> 1.3.2 #32742

merged 1 commit into from Dec 17, 2017

Conversation

afldcr
Copy link
Contributor

@afldcr afldcr commented Dec 16, 2017

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
Copy link
Contributor

Choose a reason for hiding this comment

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

Should not this instance of AppWorkPath be replaced by @data@ too?

Copy link
Member

Choose a reason for hiding this comment

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

Is APP_DATA_PATH supposed to be writeable? In that case it should be not in the nix store.

Copy link
Member

Choose a reason for hiding this comment

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

I haven't had a chance to test this yet, but the original understanding behind putting the data in the store is the nixos service copies that data from the nix store -> the state directory before starting the service. I believe this was related to the locales and static files that needed to be in the state directory.

Copy link
Member

Choose a reason for hiding this comment

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

sorry @orivej I didn't see your comment. I'll submit a PR to adjust that as well.

Copy link
Member

Choose a reason for hiding this comment

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

Err wait, nevermind. AppDataPath we don't want in the store. The whole point for replacing StaticRootPath was because it writes those files in the build there. This is correct as-is unless someone disagrees.

@afldcr
Copy link
Contributor Author

afldcr commented Dec 16, 2017 via email

@grahamc
Copy link
Member

grahamc commented Dec 17, 2017

@GrahamcOfBorg eval

@disassembler
Copy link
Member

@GrahamcOfBorg build gitea

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

can't load package: package code.gitea.io/gitea/scripts: build constraints exclude all Go files in /private/tmp/nix-build-gitea-1.3.2.drv-0/go/src/code.gitea.io/gitea/scripts
installing
/private/tmp/nix-build-gitea-1.3.2.drv-0/go /private/tmp/nix-build-gitea-1.3.2.drv-0
/private/tmp/nix-build-gitea-1.3.2.drv-0
post-installation fixup
stripping (with flags -S) in /nix/store/0z0fic8lwxz8bx4pxymbc9h81x9jvgg0-gitea-1.3.2-bin/bin
patching script interpreter paths in /nix/store/0z0fic8lwxz8bx4pxymbc9h81x9jvgg0-gitea-1.3.2-bin
patching script interpreter paths in /nix/store/kfi0py592yhqhpjiq0mp6m689sfjag6p-gitea-1.3.2
patching script interpreter paths in /nix/store/2c0mawq9r6q6iffln3jgdzyb261jqn99-gitea-1.3.2-data
/nix/store/0z0fic8lwxz8bx4pxymbc9h81x9jvgg0-gitea-1.3.2-bin

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: aarch64-linux

code.gitea.io/gitea/vendor/golang.org/x/crypto/ssh
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/charmap
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/japanese
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/korean
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/simplifiedchinese
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/traditionalchinese
code.gitea.io/gitea/vendor/golang.org/x/text/encoding/unicode
code.gitea.io/gitea/vendor/gopkg.in/testfixtures.v2
builder for '/nix/store/7324824ls821s8chqsvl4rfxyxwswc0q-gitea-1.3.2.drv' failed with exit code 48
error: build of '/nix/store/7324824ls821s8chqsvl4rfxyxwswc0q-gitea-1.3.2.drv' failed

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-linux

code.gitea.io/gitea/vendor/github.com/PuerkitoBio/goquery
code.gitea.io/gitea/integrations
code.gitea.io/gitea/modules/test
can't load package: package code.gitea.io/gitea/scripts: build constraints exclude all Go files in /tmp/nix-build-gitea-1.3.2.drv-0/go/src/code.gitea.io/gitea/scripts
installing
/tmp/nix-build-gitea-1.3.2.drv-0/go /tmp/nix-build-gitea-1.3.2.drv-0
/nix/store/qrrs86f3w24c0y8paxzv5fxy5gyqn2r1-stdenv/setup: fork: Cannot allocate memory
/nix/store/qrrs86f3w24c0y8paxzv5fxy5gyqn2r1-stdenv/setup: line 146: wait_for: No record of process 31102
builder for ‘/nix/store/06jxl0nlh4sjiy4hhx033ma6v1smasf6-gitea-1.3.2.drv’ failed with exit code 127
error: build of ‘/nix/store/06jxl0nlh4sjiy4hhx033ma6v1smasf6-gitea-1.3.2.drv’ failed

@disassembler
Copy link
Member

builds fine, tested and nixos service runs. Didn't extensively test UI, but a curl of port 3000 gives login page. merging! Thanks for the contribution!

@disassembler disassembler merged commit cfa5bb8 into NixOS:master Dec 17, 2017
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

6 participants