Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3dae6f77023d
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fdeb14f36ded
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 9, 2019

  1. Update known users

    @grahamc
    grahamc committed Mar 9, 2019
    Copy the full SHA
    be56ff1 View commit details

  2. builder: cleanup pedantry

    @grahamc
    grahamc committed Mar 9, 2019
    Copy the full SHA
    16fba6f View commit details

  3. Merge pull request #329 from NixOS/pedantry 

    Pedantry
    @grahamc
    grahamc authored Mar 9, 2019
    Copy the full SHA
    fdeb14f View commit details
Showing with 18 additions and 2 deletions.
  1. +1 −0 config.extra-known-users.json
  2. +16 −1 config.known-users.json
  3. +1 −1 ofborg/src/bin/builder.rs
1 change: 1 addition & 0 deletions config.extra-known-users.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[
"aanderse",
"anton-latukha",
"akru",
"arianvp",
"bbarker",
17 changes: 16 additions & 1 deletion config.known-users.json
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
"adisbladis",
"aforemny",
"akru",
"alyssais",
"aminechikhaoui",
"andersontorres",
"andir",
"anton-latukha",
"arianvp",
"aristidb",
"armijnhemel",
@@ -27,14 +27,17 @@
"bluescreen303",
"brainrape",
"c0bw3b",
"cdepillabout",
"chaoflow",
"cillianderoiste",
"cleverca22",
"copumpkin",
"costrouc",
"cpages",
"cstrahan",
"danbst",
"danieldk",
"delroth",
"dezgeg",
"dguibert",
"disassembler",
@@ -55,6 +58,7 @@
"erictapen",
"erikarvstedt",
"etu",
"etu",
"falsifian",
"fgaz",
"flokli",
@@ -70,16 +74,20 @@
"grahamc",
"grahamcofborg",
"grwlf",
"hedning",
"hrdinka",
"imalsogreg",
"infinisil",
"izorkin",
"jacereda",
"jagajaga",
"jfrankenau",
"jgeerds",
"jlesquembre",
"jluttine",
"joachifm",
"johanot",
"jokogr",
"jtojnar",
"jwiegley",
"kalbasit",
@@ -96,6 +104,7 @@
"madjar",
"maggesi",
"markuskowa",
"marsam",
"matejc",
"matthewbauer",
"mic92",
@@ -107,11 +116,13 @@
"nh2",
"nicolaspetton",
"nlewo",
"nyanloutre",
"obadz",
"ocharles",
"offlinehacker",
"orivej-nixos",
"oxij",
"pacien",
"pbogdan",
"peterhoeg",
"peti",
@@ -128,6 +139,7 @@
"roberth",
"roconnor",
"rushmorem",
"rvolosatovs",
"ryantm",
"ryantrinkle",
"rycee",
@@ -143,6 +155,7 @@
"the-kenny",
"thomasmader",
"thoughtpolice",
"tilpner",
"timokau",
"tomberek",
"ts468",
@@ -151,6 +164,7 @@
"va1entin",
"vbgl",
"vcunat",
"vdemeester",
"veprbl",
"viric",
"volth",
@@ -159,6 +173,7 @@
"wkennington",
"wmertens",
"woffs",
"worldofpeace",
"xeji",
"xeji",
"yegortimoshenko",
2 changes: 1 addition & 1 deletion ofborg/src/bin/builder.rs
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ fn main() {
let cloner = checkout::cached_cloner(Path::new(&cfg.checkout.root));
let nix = cfg.nix();

if cfg.feedback.full_logs != true {
if !cfg.feedback.full_logs {
warn!("Please define feedback.full_logs in your configuration to true!");
warn!("feedback.full_logs when true will cause the full build log to be sent back");
warn!("to the server, and be viewable by everyone.");