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: 434f4dc5bb3a
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08acb8af729a
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 3, 2019

  1. move pedantry up, set -x

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08acb8a View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −2 .travis.yml
  2. +2 −0 shell.nix
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ nix: 2.1
sudo: true
matrix:
include:
- name: cargo pedantry
script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay
- name: checkPhase - Nix 2
script: nix-shell --run checkPhase --arg useNix1 false
- name: checkPhase - Nix 2
script: nix-shell --run checkPhase --arg useNix1 false
- name: checkPhase - Nix 1
script: nix-shell --run checkPhase --arg useNix1 true
- name: cargo pedantry
script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay
2 changes: 2 additions & 0 deletions shell.nix
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,8 @@ let
checkPhase() (
cd "${builtins.toString ./.}/ofborg"
set +x
cargo fmt
git diff --exit-code
cargofmtexit=$?