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/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6604664991b
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01b31277607f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 20, 2020

  1. Extract ci actions to ./ci/ scripts 

    This extracts the actions performed by the GitHub CI into scripts in
./ci/check-*.sh to allow for easier local execution.
    @gilligan
    gilligan committed Apr 20, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Luap99 Paul Holzinger
    GPG key ID: EB145DD938A3CAF2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4ebb18b View commit details

  2. Merge pull request #1310 from gilligan/ci-scripts 

    Extract ci actions to ./ci/ scripts
    @grahamc
    grahamc authored Apr 20, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Luap99 Paul Holzinger
    GPG key ID: EB145DD938A3CAF2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01b3127 View commit details
Showing with 19 additions and 5 deletions.
  1. +4 −5 .github/workflows/ci.yml
  2. +4 −0 ci/check-formatting.sh
  3. +4 −0 ci/check-mypy.sh
  4. +3 −0 ci/check-nix-files.sh
  5. +4 −0 ci/check-tests.sh
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Parsing
run: 'find . -name "*.nix" -exec nix-instantiate --parse --quiet {} >/dev/null +'
run: './ci/check-nix-files.sh'
build:
runs-on: ubuntu-latest
steps:
@@ -31,7 +31,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Black
run: 'nix-shell --run "black . --check --diff"'
run: './ci/check-formatting.sh'
mypy:
runs-on: ubuntu-latest
steps:
@@ -40,7 +40,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Mypy
run: 'nix-shell --run "mypy nixops"'
run: './ci/check-mypy.sh'
mypy-ratchet:
runs-on: ubuntu-latest
steps:
@@ -58,5 +58,4 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Coverage
run: |
nix-shell --run "./coverage-tests.py -a '!libvirtd,!gce,!ec2,!azure' -v"
run: './ci/check-tests.sh'
4 changes: 4 additions & 0 deletions ci/check-formatting.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell ../shell.nix -i bash

black . --check --diff
4 changes: 4 additions & 0 deletions ci/check-mypy.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell ../shell.nix -i bash

mypy nixops
3 changes: 3 additions & 0 deletions ci/check-nix-files.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

find . -name "*.nix" -exec nix-instantiate --parse --quiet {} >/dev/null +
4 changes: 4 additions & 0 deletions ci/check-tests.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell ../shell.nix -i bash

./coverage-tests.py -a '!libvirtd,!gce,!ec2,!azure' -v