Skip to content

Commit

Permalink
Merge pull request #27 from hollie/master
Browse files Browse the repository at this point in the history
Master Merge
  • Loading branch information
Wayne Gatlin authored Apr 23, 2021
2 parents 7422319 + df14d29 commit 9ee446d
Show file tree
Hide file tree
Showing 26 changed files with 3,243 additions and 1,645 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CI on master

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
test_master:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ['ubuntu-latest']
perl: [ '5.32', '5.30' ]
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: shogo82148/actions-setup-perl@v1
with:
perl-version: ${{ matrix.perl }}
- run: perl -V
- run: sudo apt-get install libgd-gd2-perl
- run: cd bin ; ./mh -tk 0 -debug process -code_dir ../code/test
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
MisterHouse
===========

[![Build Status](https://travis-ci.com/hollie/misterhouse.svg?branch=master)](https://travis-ci.com/hollie/misterhouse)
[![Actions Status](https://github.com/hollie/misterhouse/workflows/CI%20on%20master/badge.svg)](https://github.com/hollie/misterhouse/actions)


Perl open source home automation program. It's fun, it's free, and it's entirely geeky.

Expand Down
1 change: 0 additions & 1 deletion bin/get_email
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ sub setup {
for my $parm ( keys %config_parms_startup ) {
$config_parms{$parm} = $config_parms_startup{$parm};
}

# Ignore any non-email debug parm in .ini file or command line flag used
$config_parms{debug} = undef
unless $config_parms{debug} eq 'email' or $config_parms_startup{debug};
Expand Down
Loading

0 comments on commit 9ee446d

Please sign in to comment.