From d1435cad8fb786bb13a86fd8548fa668e866cbec Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 21 Jan 2021 12:14:21 +0100 Subject: [PATCH 1/5] Removed .coveralls.yml --- .coveralls.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 91600595..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -service_name: travis-ci From bd56256d5d76bc81cc6bcaf156a94436f85dec49 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 21 Jan 2021 12:14:21 +0100 Subject: [PATCH 2/5] Removed Dockerfile --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 94abc860..00000000 --- a/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - From b5791a58c9efd838b180cdd74cbe93835645a337 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 21 Jan 2021 12:14:21 +0100 Subject: [PATCH 3/5] Removed .travis.yml --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a980b543..00000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-ntp-client-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ntp-client-image yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ntp-client-image rake check:doc From 3ffc3b8786ffc0be68955c9eab9d30071b9950e1 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 21 Jan 2021 12:15:29 +0100 Subject: [PATCH 4/5] Add github actions --- .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++++++++++++++++ test/test_helper.rb | 17 +++++++-- 2 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..a39a5018 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,82 @@ + +# 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: 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 diff --git a/test/test_helper.rb b/test/test_helper.rb index 1c5abe3e..ee969ccb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -48,12 +48,21 @@ def dhcp_ntp_servers # 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 + From 79814c6b798cb9c553a17ba2d1e287a2e5b4c3a9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 21 Jan 2021 12:15:39 +0100 Subject: [PATCH 5/5] update badges --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e960d4b5..3b66a440 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # YaST - The NTP Client Module # -[![Travis Build](https://travis-ci.org/yast/yast-ntp-client.svg?branch=master)](https://travis-ci.org/yast/yast-ntp-client) -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-ntp-client-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-ntp-client-master/) -[![Coverage Status](https://img.shields.io/coveralls/yast/yast-ntp-client.svg)](https://coveralls.io/r/yast/yast-ntp-client?branch=master) - +[![Workflow Status](https://github.com/yast/yast-bootloader/workflows/CI/badge.svg?branch=master)]( +https://github.com/yast/yast-bootloader/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-bootloader-master)]( +https://ci.opensuse.org/view/Yast/job/yast-yast-bootloader-master/) +[![Coverage Status](https://img.shields.io/coveralls/yast/yast-bootloader.svg)](https://coveralls.io/r/yast/yast-bootloader?branch=master) +[![inline docs](http://inch-ci.org/github/yast/yast-bootloader.svg?branch=master)](http://inch-ci.org/github/yast/yast-bootloader)