Skip to content

Commit

Permalink
Merge 1aac1a7 into 9b79d5a
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Jan 14, 2021
2 parents 9b79d5a + 1aac1a7 commit 6b5b6d6
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 30 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

85 changes: 85 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@

# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions

name: CI

on: [push, pull_request]

jobs:
Tests:
runs-on: ubuntu-latest
container: registry.opensuse.org/yast/head/containers/yast-ruby:latest

steps:

- name: Git Checkout
uses: actions/checkout@v2

# just for easier debugging...
- name: Inspect Installed Packages
run: rpm -qa | sort

- name: Unit Tests
run: rake test:unit
# enable code coverage reporting
env:
COVERAGE: 1

# send the coverage report to coveralls.io
- name: Coveralls Report
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

Rubocop:
runs-on: ubuntu-latest
container: registry.opensuse.org/yast/head/containers/yast-ruby:latest

steps:

- name: Git Checkout
uses: actions/checkout@v2

- name: Rubocop
run: rake check:rubocop

Package:
runs-on: ubuntu-latest
container: registry.opensuse.org/yast/head/containers/yast-ruby:latest

steps:

- name: Git Checkout
uses: actions/checkout@v2

- name: Install Dependencies
run: zypper --non-interactive install libboost_regex-devel gcc-c++ libtool yast2-core-devel

- name: Package Build
run: yast-ci-ruby -o package

Yardoc:
runs-on: ubuntu-latest
container: registry.opensuse.org/yast/head/containers/yast-ruby:latest

steps:

- name: Git Checkout
uses: actions/checkout@v2

- name: Yardoc
run: rake check:doc

# downloading the Docker image takes some time so bundling several fast
# checks into one job avoids that overhead
Checks:
runs-on: ubuntu-latest
container: registry.opensuse.org/yast/head/containers/yast-ruby:latest

steps:

- name: Git Checkout
uses: actions/checkout@v2

- name: POT Check
run: rake check:pot
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

8 changes: 0 additions & 8 deletions Dockerfile

This file was deleted.

10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# YaST - The Squid Module #

[![Travis Build](https://travis-ci.org/yast/yast-squid.svg?branch=master)](https://travis-ci.org/yast/yast-squid)
[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-squid-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-squid-master/)
[![Coverage Status](https://img.shields.io/coveralls/yast/yast-squid/master.svg)](https://coveralls.io/github/yast/yast-squid?branch=master)

[![Workflow Status](https://github.com/yast/yast-squid/workflows/CI/badge.svg?branch=master)](
https://github.com/yast/yast-squid/actions?query=branch%3Amaster)
[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-squid-master)](
https://ci.opensuse.org/view/Yast/job/yast-yast-squid-master/)
[![Coverage Status](https://img.shields.io/coveralls/yast/yast-squid.svg)](https://coveralls.io/r/yast/yast-squid?branch=master)
[![inline docs](http://inch-ci.org/github/yast/yast-squid.svg?branch=master)](http://inch-ci.org/github/yast/yast-squid)
2 changes: 1 addition & 1 deletion test/squid_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
context "when running in normal mode" do
it "does not call to #EnableService nor #DisableService" do
expect(squid).to_not receive(:EnableService)
expect(squid).to_not receive(:Disableervice)
expect(squid).to_not receive(:DisableService)

squid.Write
end
Expand Down
29 changes: 24 additions & 5 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,41 @@

include Yast::Logger

RSpec.configure do |config|
config.mock_with :rspec do |mocks|
# If you misremember a method name both in code and in tests,
# will save you.
# https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partial-doubles
#
# With graceful degradation for RSpec 2
mocks.verify_partial_doubles = true if mocks.respond_to?(:verify_partial_doubles=)
end
end

if ENV["COVERAGE"]
require "simplecov"
SimpleCov.start do
add_filter "/test/"
end

src_location = File.expand_path("../src", __FILE__)
src_location = File.expand_path("../src", __dir__)
# track all ruby files under src
SimpleCov.track_files("#{src_location}/**/*.rb")

# use coveralls for on-line code coverage reporting at Travis CI
if ENV["TRAVIS"]
require "coveralls"
# additionally use the LCOV format for on-line code coverage reporting at CI
if ENV["CI"] || ENV["COVERAGE_LCOV"]
require "simplecov-lcov"

SimpleCov::Formatter::LcovFormatter.config do |c|
c.report_with_single_file = true
# this is the default Coveralls GitHub Action location
# https://github.com/marketplace/actions/coveralls-github-action
c.single_report_path = "coverage/lcov.info"
end

SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
SimpleCov::Formatter::HTMLFormatter,
Coveralls::SimpleCov::Formatter
SimpleCov::Formatter::LcovFormatter
]
end
end

0 comments on commit 6b5b6d6

Please sign in to comment.