From a0d3f98679f602d227011b7398d676b015b9e43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Nov 2020 15:09:03 +0100 Subject: [PATCH 1/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 94abc8600..000000000 --- a/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - From 1d2d061b214c390c2ca2902b4d4f92aa5528bdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Nov 2020 15:09:29 +0100 Subject: [PATCH 2/5] Removed .travis.yml --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 68c653804..000000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-packager-image . - # list the installed packages (just for easier debugging) - - docker run --rm -it yast-packager-image rpm -qa | sort - -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 - # exclude the yardoc step, we run the more strict check:doc later - - docker run --rm -it yast-packager-image yast-travis-ruby -x yardoc - - docker run --rm -it yast-packager-image rake check:doc - - docker run --rm -it yast-packager-image shellcheck src/bin/sw_single_wrapper From c417d22c45efc1b956261a1a0dd91a69ab9c0965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Nov 2020 15:09:46 +0100 Subject: [PATCH 3/5] Removed .cirrus.yml --- .cirrus.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index de8cebe74..000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,29 +0,0 @@ -container: - image: registry.opensuse.org/yast/head/containers/yast-ruby:latest - -Rubocop_task: - container: - cpu: 8 - test_script: rake check:rubocop - only_if: "changesInclude('.cirrus.yml', '.rubocop.yml', 'Rakefile', '**/*.rake', '*.rb', '**/*.rb')" - -Unit Tests_task: - environment: - COVERAGE: 1 - COVERALLS_REPO_TOKEN: ENCRYPTED[07f77b1412f23d9201d0255c60b61781b308a2db9af24f07e48f1331ee80460c2e3b858f39f737294de04f94e55cc52d] - # Fake a Travis build to send the code coverage to coveralls.io - TRAVIS: 1 - test_script: rake test:unit && shellcheck src/bin/sw_single_wrapper - -yardoc_task: - yardoc_cache_cache: - folder: .yardoc - test_script: rake check:doc - only_if: "changesInclude('.cirrus.yml', 'Rakefile', '**/*.rake', '*.rb', '**/*.rb')" - -Package Build_task: - # run the other steps - test_script: yast-travis-ruby -x tests -x rubocop -x yardoc - -Debug_task: - test_script: "uname -a; echo '---------'; rpm -qa | sort; echo '---------'; df -h; echo '---------'; free -h" From b3c3a0d34fe4b64a40fa38178a4edd930a5d7a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Nov 2020 15:10:25 +0100 Subject: [PATCH 4/5] Added GitHub Action --- .github/workflows/ci.yml | 88 ++++++++++++++++++++++++++++++++++++++++ test/test_helper.rb | 18 +++++--- 2 files changed, 101 insertions(+), 5 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 000000000..874f03317 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,88 @@ + +# 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@v1 + + # 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@v1 + + - 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@v1 + + - 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@v1 + + - 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@v1 + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot + + - name: Shell Check + run: shellcheck src/bin/sw_single_wrapper diff --git a/test/test_helper.rb b/test/test_helper.rb index d26961c0d..3103eb7de 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -50,12 +50,20 @@ def stub_module(name) # track all ruby files under src SimpleCov.track_files("#{srcdir}/**/*.rb") - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" - SimpleCov.formatters = [ + # 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 5f3da8f38545119b9573e4d4f1eeb38500f03e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Nov 2020 15:12:00 +0100 Subject: [PATCH 5/5] README.md - updated badges --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 423a7d988..6fa15e167 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # YaST - The Package Management Libraries # -[![Travis Build](https://travis-ci.org/yast/yast-packager.svg?branch=master)](https://travis-ci.org/yast/yast-packager) -[![Build Status](https://api.cirrus-ci.com/github/yast/yast-packager.svg?branch=master)](https://cirrus-ci.com/github/yast/yast-packager?branch=master) -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-yast-packager-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-yast-packager-master/) +[![Workflow Status](https://github.com/yast/yast-packager/workflows/CI/badge.svg?branch=master)]( +https://github.com/yast/yast-packager/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-packager-master)]( +https://ci.opensuse.org/view/Yast/job/yast-yast-packager-master/) [![Coverage Status](https://coveralls.io/repos/github/yast/yast-packager/badge.svg?branch=master)](https://coveralls.io/github/yast/yast-packager?branch=master)