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

Commits on Jun 15, 2020

  1. ci: add GitHub Actions

    @cole-h
    cole-h committed Jun 15, 2020
    Copy the full SHA
    531e36f View commit details

  2. ci: remove Travis 

    Nixpkgs requires Nix 2.2 or greater to evaluate as of
NixOS/nixpkgs@9679531,
and Travis does not appear to support this version yet, causing CI to
report failures on probably-good PRs. This can be reverted later on down
the line if we decide to have both GitHub Actions and Travis for
redundancy.
    @cole-h
    cole-h committed Jun 15, 2020
    Copy the full SHA
    5f9892a View commit details
Showing with 38 additions and 11 deletions.
  1. +38 −0 .github/workflows/ci.yml
  2. +0 −11 .travis.yml
38 changes: 38 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: CI

on:
push:
branches: [master]
pull_request:

jobs:
pedantry:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Nix
uses: cachix/install-nix-action@v9
- name: Cargo Pedantry
run: nix-shell --run checkPhase -A mozilla-rust-overlay

checkPhase:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Nix
uses: cachix/install-nix-action@v9
- name: Set up git
run: |
git config --global user.email "ofborg@example.com"
git config --global user.name "ofborg"
- name: checkPhase
run: nix-shell --run checkPhase

nix-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Nix
uses: cachix/install-nix-action@v9
- name: nix-build
run: nix-build -A ofborg.rs -A ofborg.php
11 changes: 0 additions & 11 deletions .travis.yml
View file

This file was deleted.