Skip to content

Commit

Permalink
Merge pull request #51 from VictorSNA/master
Browse files Browse the repository at this point in the history
Fixes broken tests in CI due ruby version and minor improvements
  • Loading branch information
VictorSNA authored Oct 18, 2021
2 parents 65c3db7 + 8ff44e2 commit 6b84629
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 26 deletions.
40 changes: 19 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
name: ci
name: CI

on:
push:
branches:
- "*"
pull_request:
branches:
- "*"
on: [push, pull_request]

jobs:
testgi:
runs-on: ubuntu-latest
test:
strategy:
fail-fast: false
matrix:
ruby-version: ["2.6", "2.7", "3.0"]
os: [ubuntu-latest]
ruby: ["2.6", "2.7", "3.0"]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- uses: actions/checkout@v2

- name: Run tests
run: |
bundle install --jobs 4 --retry 3
bundle exec rspec
- name: Set up Ruby, bundler and dependencies
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Run tests
run: bundle exec rspec

- name: Run linter
run: bundle exec rubocop
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.gems/
*.gem
*.rbc
.bundle
Expand Down
3 changes: 0 additions & 3 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
= Heart Check - Changelog

== Version 2.4.0 :: 2021-10-01
* Add docker to facilitate development

== Version 2.3.1 :: 2021-06-14
* Move and rename GitHub template files to correct folder

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ declare service checks and an URI that returns the status for each service.
With this gem you can monitor if your app has access to the database, a cache
service, an API, etc.

[![Build Status](https://travis-ci.org/locaweb/heartcheck.svg)](https://travis-ci.org/locaweb/heartcheck)
[![Build Status](https://github.com/locaweb/heartcheck/actions/workflows/ci.yml/badge.svg)](https://github.com/locaweb/heartcheck/actions/workflows/ci.yml)
[![Code Climate](https://codeclimate.com/github/locaweb/heartcheck/badges/gpa.svg)](https://codeclimate.com/github/locaweb/heartcheck)
[![Ebert](https://ebertapp.io/github/locaweb/heartcheck.svg)](https://ebertapp.io/github/locaweb/heartcheck)

Expand Down
2 changes: 1 addition & 1 deletion lib/heartcheck/checks/firewall.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
# frozen_string_literal: false

module Heartcheck
module Checks
Expand Down

0 comments on commit 6b84629

Please sign in to comment.