Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes broken tests in CI due ruby version and minor improvements #51

Merged
merged 7 commits into from
Oct 18, 2021
Merged

Fixes broken tests in CI due ruby version and minor improvements #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52cacc3
Updates CI for heartcheck
Oct 18, 2021
916c6f8
Adds linter and fix duplicated bundle install
Oct 18, 2021
1ef3ac0
Ignore .gems folder as it's not necessary for heartcheck gem
Oct 18, 2021
fcb4297
Fix badge to point to github actions ci
Oct 18, 2021
27c32b5
Removed frozen string due necessary modification in string
Oct 18, 2021
8329c08
Removes changelog information, as we're not going to bump minor version
Oct 18, 2021
8ff44e2
Improve CI step description
Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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