Skip to content

Commit

Permalink
Fixes ruby setup and switches to platform yamllint (#176)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored Jan 11, 2024
1 parent 638d973 commit 8c40cf4
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 44 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ jobs:
with:
fetch-depth: 1 # full history is not needed
- name: Set up Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: '2.7'
# Match build-bin/configure_test
rubygems: '3.4.22'
bundler: '2.4.22'
bundler-cache: true
- name: Test
run: build-bin/configure_test && build-bin/test
run: build-bin/test
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
source 'https://rubygems.org'

# As of v4 jekyll includes github-pages
gem 'jekyll', '~>4'
gem 'jekyll', '~>4.3'

require 'json'
require 'open-uri'
gem "yaml-lint", "~> 0.0.10"
gem "terminal-table", "~> 1.8"
gem "terminal-table", "~> 3.0"
73 changes: 39 additions & 34 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,70 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.7)
em-websocket (0.5.2)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.13.1)
ffi (1.16.3)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.5)
google-protobuf (3.25.2-arm64-darwin)
google-protobuf (3.25.2-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.1.1)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.1)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 1.8)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.3.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
rb-fsevent (0.10.4)
public_suffix (5.0.4)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.25.0)
rexml (3.2.6)
rouge (4.2.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.7.0)
yaml-lint (0.0.10)
sass-embedded (1.63.6-arm64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.63.6-x86_64-linux-gnu)
google-protobuf (~> 3.23)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
ruby
arm64-darwin-23
x86_64-linux

DEPENDENCIES
jekyll (~> 4)
terminal-table (~> 1.8)
yaml-lint (~> 0.0.10)
jekyll (~> 4.3)
terminal-table (~> 3.0)

BUNDLED WITH
2.1.4
2.4.22
2 changes: 1 addition & 1 deletion _data/community_tracers_instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
[Echo](https://echo.labstack.com/)
propagation: Http (B3), easy to add others
transports: Http
sampling: "Yes"
sampling: "Yes"

- language: Java
library: >-
Expand Down
4 changes: 3 additions & 1 deletion build-bin/gem/bundle_install
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
set -ue

# This script ensures bundler is setup and install is run
gem install bundler
# Note: these are the last versions of rubygems and bundler to support Ruby 2.7
gem install rubygems-update -v 3.4.22
gem install bundler -v 2.4.22
bundle install
2 changes: 1 addition & 1 deletion build-bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -ue
# This script runs the tests of the project.
#
# See [README.md] for an explanation of this and how CI should use it.
bundle exec yaml-lint -i -q .
yamllint -d relaxed _config.yml docker-compose.yml _data/*.yml
bundle exec jekyll build
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ services:
ports:
- 4000:4000
volumes:
- .:/srv/jekyll
- .:/srv/jekyll

0 comments on commit 8c40cf4

Please sign in to comment.