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.

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

[development-release] CI Simplification #139

Merged
merged 19 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
67 changes: 26 additions & 41 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,33 @@
name: Build

on: [push, pull_request]

env:
FULL_COVERAGE_CHECK: true

on: [push]
jobs:
full-check:
mainstream-ruby-full-check:
runs-on: ubuntu-latest

# We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != '0exp/qonfig'

env:
FULL_COVERAGE_CHECK: true
TEST_PLUGINS: true
FULL_TEST_COVERAGE_CHECK: true
BUNDLE_GEMFILE: gemfiles/with_external_deps.gemfile
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
- name: Run Linter
run: bundle exec ci-helper RubocopLint
- name: Check missed spec suffixes
run: bundle exec ci-helper CheckSpecSuffixes --extra-paths spec/*.rb --ignored-paths spec/*_helper.rb spec/**/*_examples.rb
- name: Run Specs (with dependencies)
run: bin/rspec -w
- name: Run Specs (without dependencies)
run: bin/rspec -n
- name: Audit
run: bundle exec ci-helper BundlerAudit
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
specs:
ruby-version: "3.3"
bundler-cache: true
- name: (Bundler) Install dependencies
run: bundle install
- name: (Rubocop) Check for codestyle
run: bundle exec rake rubocop
- name: (RSpec) Tests
run: bundle exec rake rspec
specs-on-relevant-rubies:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}

env:
FULL_COVERAGE_CHECK: false

# We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != '0exp/qonfig'

TEST_PLUGINS: true
FULL_TEST_COVERAGE_CHECK: true
BUNDLE_GEMFILE: gemfiles/with_external_deps.gemfile
strategy:
fail-fast: false
matrix:
Expand All @@ -49,15 +36,13 @@ jobs:
include:
- ruby: head
experimental: true
- ruby: jruby
experimental: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Run Specs (with dependencies)
run: bin/rspec -w
- name: Run Specs (without dependencies)
run: bin/rspec -n
bundler-cache: false
- name: (Bundler) Install dependencies
run: bundle install
- name: (RSpec) Tests
run: bundle exec rake rspec
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
- Updated code style;
- Dropped EOL rubies support. Now Qonfig supports ruby with version `>= 3.1`;
- CI: returned separated plugin-related specs (`bin/rspec -w` + `bin/rspec -n` (with- and without- plugins respectively));
- CI: dropped coveralls (temporary);
- CI: droppet java-based rubies support (temporary);
- Simplified CI;

## [0.29.0] - 2024-05-06
### Added
Expand Down
32 changes: 4 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ PATH
remote: .
specs:
qonfig (0.29.1)
base64 (>= 0.2)

GEM
remote: https://rubygems.org/
Expand All @@ -22,20 +23,11 @@ GEM
rubocop-rspec (= 3.2.0)
rubocop-rspec_rails (= 2.30.0)
ast (2.4.2)
bigdecimal (3.1.8)
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
ci-helper (0.7.0)
colorize (~> 1.1)
dry-inflector (~> 1.0)
umbrellio-sequel-plugins (~> 0.14)
base64 (0.2.0)
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
docile (1.4.1)
dry-inflector (1.1.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.0)
Expand Down Expand Up @@ -99,42 +91,26 @@ GEM
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-progressbar (1.13.0)
sequel (5.87.0)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
thor (1.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
umbrellio-sequel-plugins (0.17.0)
sequel
unicode-display_width (2.6.0)
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
arm64-darwin-24
ruby
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
activesupport (~> 6, < 8)
armitage-rubocop (~> 1.68)
armitage-rubocop (~> 1.59)
bundler (>= 1)
bundler-audit (~> 0.9)
ci-helper (~> 0.7)
pry (~> 0.15)
qonfig!
rake (>= 13)
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Qonfig &middot; [![Gem Version](https://badge.fury.io/rb/qonfig.svg)](https://badge.fury.io/rb/qonfig) [![Coverage Status](https://coveralls.io/repos/github/0exp/qonfig/badge.svg?branch=master)](https://coveralls.io/github/0exp/qonfig?branch=master)
# Qonfig &middot; [![Gem Version](https://badge.fury.io/rb/qonfig.svg)](https://badge.fury.io/rb/qonfig) [![Build](https://github.com/0exp/qonfig/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/0exp/qonfig/actions)

Powerful configuration Ruby-framework with a support for many commonly used config formats with a multi-functional API, developer-friendly DSL and object-oriented behavior.

Expand Down Expand Up @@ -3346,7 +3346,8 @@ Qonfig.plugin(:vault)
- Instantiation and reloading callbacks;
- File geneartors (.rb-files with a pre-filled code (and (maybe) with a pre-generated yaml/json/etc files));
- Setting value changement subscriptions and callbacks;

- CI rework (new configs, new steps, no strange dependencies);

## Build

```shell
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/with_external_deps.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ source 'https://rubygems.org'
gem 'toml-rb', '>= 2'
# @since 0.25.0 (qonfig: :vault plugin)
gem 'vault', '>= 0.1'
# @since 0.30.0 (qonfig: :vault plugin dependency)
gem 'base64'

gemspec path: '..'
22 changes: 4 additions & 18 deletions gemfiles/with_external_deps.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ PATH
remote: ..
specs:
qonfig (0.29.1)
base64 (>= 0.2)

GEM
remote: https://rubygems.org/
Expand All @@ -25,21 +26,12 @@ GEM
aws-eventstream (1.3.0)
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
bigdecimal (3.1.8)
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
ci-helper (0.7.0)
colorize (~> 1.1)
dry-inflector (~> 1.0)
umbrellio-sequel-plugins (~> 0.14)
base64 (0.2.0)
citrus (3.0.2)
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
docile (1.4.1)
dry-inflector (1.1.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.0)
Expand Down Expand Up @@ -103,23 +95,18 @@ GEM
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-progressbar (1.13.0)
sequel (5.87.0)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
thor (1.3.2)
toml-rb (3.0.1)
citrus (~> 3.0, > 3.0)
racc (~> 1.7)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
umbrellio-sequel-plugins (0.17.0)
sequel
unicode-display_width (2.6.0)
vault (0.18.2)
aws-sigv4
Expand All @@ -131,10 +118,9 @@ PLATFORMS

DEPENDENCIES
activesupport (~> 6, < 8)
armitage-rubocop (~> 1.68)
armitage-rubocop (~> 1.59)
base64
bundler (>= 1)
bundler-audit (~> 0.9)
ci-helper (~> 0.7)
pry (~> 0.15)
qonfig!
rake (>= 13)
Expand Down
21 changes: 3 additions & 18 deletions gemfiles/without_external_deps.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ PATH
remote: ..
specs:
qonfig (0.29.1)
base64 (>= 0.2)

GEM
remote: https://rubygems.org/
Expand All @@ -22,20 +23,11 @@ GEM
rubocop-rspec (= 3.2.0)
rubocop-rspec_rails (= 2.30.0)
ast (2.4.2)
bigdecimal (3.1.8)
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
ci-helper (0.7.0)
colorize (~> 1.1)
dry-inflector (~> 1.0)
umbrellio-sequel-plugins (~> 0.14)
base64 (0.2.0)
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
docile (1.4.1)
dry-inflector (1.1.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.0)
Expand Down Expand Up @@ -99,20 +91,15 @@ GEM
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-progressbar (1.13.0)
sequel (5.87.0)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
thor (1.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
umbrellio-sequel-plugins (0.17.0)
sequel
unicode-display_width (2.6.0)
zeitwerk (2.7.1)

Expand All @@ -122,10 +109,8 @@ PLATFORMS

DEPENDENCIES
activesupport (~> 6, < 8)
armitage-rubocop (~> 1.68)
armitage-rubocop (~> 1.59)
bundler (>= 1)
bundler-audit (~> 0.9)
ci-helper (~> 0.7)
pry (~> 0.15)
qonfig!
rake (>= 13)
Expand Down
1 change: 1 addition & 0 deletions lib/qonfig.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
require 'json'
require 'erb'
require 'pathname'
require 'base64'

# @api public
# @since 0.1.0
Expand Down
8 changes: 4 additions & 4 deletions qonfig.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ Gem::Specification.new do |spec|

spec.files = `git ls-files -z`.split("\x0")

spec.add_dependency 'base64', '>= 0.2'

spec.add_development_dependency 'simplecov', '~> 0.22'
spec.add_development_dependency 'rspec', '~> 3.2'
spec.add_development_dependency 'armitage-rubocop', '~> 1.68'
spec.add_development_dependency 'armitage-rubocop', '~> 1.59'
spec.add_development_dependency 'activesupport', '~> 6', '< 8'
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'bundler-audit', '~> 0.9'
spec.add_development_dependency 'ci-helper', '~> 0.7'
spec.add_development_dependency 'bundler', '>= 1'
spec.add_development_dependency 'pry', '~> 0.15'
spec.add_development_dependency 'rake', '>= 13'
spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
Expand Down
Loading