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

Backport gitea: 1.6.3 -> 1.6.4 #54364

Merged
merged 1 commit into from Jan 21, 2019

Conversation

etu
Copy link
Contributor

@etu etu commented Jan 20, 2019

Motivation for this change

Backport of #54031

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@etu
Copy link
Contributor Author

etu commented Jan 20, 2019

@GrahamcOfBorg build nixosTests.gitea gitea

@worldofpeace
Copy link
Contributor

@etu Did this used to build on aarch64? It isn't now.

@etu
Copy link
Contributor Author

etu commented Jan 20, 2019

@worldofpeace It's been flaky on unstable in the past on aarch64, so that's not uncommon :/

https://hydra.nixos.org/job/nixpkgs/staging/gitea.aarch64-linux

But not on stable, which is weird: https://hydra.nixos.org/job/nixos/release-18.09-aarch64/nixpkgs.gitea.aarch64-linux

@etu
Copy link
Contributor Author

etu commented Jan 21, 2019

Trying this again for aarch64...

@GrahamcOfBorg build gitea

@etu
Copy link
Contributor Author

etu commented Jan 21, 2019

@worldofpeace Hey,

I've just built gitea on my raspberry pi. Not sure why it doesn't build on the builder bot.

user@rpi-ha ~/nixpkgs $ ./result-bin/bin/gitea 
2019/01/21 13:34:38 [W] Custom config '/home/user/nixpkgs/result-bin/bin/custom/conf/app.ini' not found, ignore this if you're running first time
2019/01/21 13:34:38 [...s/setting/setting.go:979 NewContext()] [E] Failed to create '/home/user/nixpkgs/result-bin/bin/custom/conf/app.ini': mkdir /home/user/nixpkgs/result-bin/bin/custom: read-only file system

user@rpi-ha ~/nixpkgs $ ./result-bin/bin/gitea --version
Gitea version 1.6.4 built with: sqlite

And I'd say that the behavior of running the binary is expected since it's not expected to run like that without any config or so. Just wanted to test that the binary works.

@worldofpeace
Copy link
Contributor

@worldofpeace Hey,

I've just built gitea on my raspberry pi. Not sure why it doesn't build on the builder bot.

user@rpi-ha ~/nixpkgs $ ./result-bin/bin/gitea 
2019/01/21 13:34:38 [W] Custom config '/home/user/nixpkgs/result-bin/bin/custom/conf/app.ini' not found, ignore this if you're running first time
2019/01/21 13:34:38 [...s/setting/setting.go:979 NewContext()] [E] Failed to create '/home/user/nixpkgs/result-bin/bin/custom/conf/app.ini': mkdir /home/user/nixpkgs/result-bin/bin/custom: read-only file system

user@rpi-ha ~/nixpkgs $ ./result-bin/bin/gitea --version
Gitea version 1.6.4 built with: sqlite

And I'd say that the behavior of running the binary is expected since it's not expected to run like that without any config or so. Just wanted to test that the binary works.

That's really great of you to check this 🥇
I'd say in that case, we can merge. No need to hold this off.

@worldofpeace worldofpeace merged commit a21dad5 into NixOS:release-18.09 Jan 21, 2019
@worldofpeace
Copy link
Contributor

Aargh, I merged with without noticing you didn't use git cherry-pick -xe.
Too late now 😄

@etu etu deleted the stable-upgrade-gitea branch January 21, 2019 18:26
@etu
Copy link
Contributor Author

etu commented Jan 21, 2019

@worldofpeace Oh, wasn't aware of the -x flag. I use magit but it's available from there as well. I'll remember it for the next time :-)

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