Skip to content

Commit 52b95de

Browse files
committed
πŸ’š More CI fixes
1 parent 28a76da commit 52b95de

File tree

12 files changed

+69
-28
lines changed

12 files changed

+69
-28
lines changed

β€Ž.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ PATH_add bin
1515
# export RUBYOPT="-W0"
1616

1717
### External Testing Controls
18+
export COVERAGE=true
1819
export K_SOUP_COV_DO=true # Means you want code coverage
1920
# Available formats are html, xml, rcov, lcov, json, tty
2021
export K_SOUP_COV_COMMAND_NAME="MiniTest Coverage"

β€Ž.github/workflows/current-runtime-heads.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concurrency:
2929

3030
jobs:
3131
test:
32-
name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
32+
name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
3333
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3434
runs-on: ubuntu-latest
3535
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -56,6 +56,7 @@ jobs:
5656

5757
# jruby-10.0 (targets Ruby 3.4 compatibility)
5858
- ruby: "jruby"
59+
if: ${{ !env.ACT }}
5960
appraisal_name: "dep-heads"
6061
exec_cmd: "rake test"
6162
gemfile: "Appraisal.root"

β€Ž.github/workflows/current.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828

2929
jobs:
3030
test:
31-
name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
31+
name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
3232
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3333
runs-on: ubuntu-latest
3434
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -55,6 +55,7 @@ jobs:
5555

5656
# jruby-10.0 (targets Ruby 3.4 compatibility)
5757
- ruby: "jruby"
58+
if: ${{ !env.ACT }}
5859
appraisal_name: "r3"
5960
exec_cmd: "rake test"
6061
gemfile: "Appraisal.root"

β€Ž.github/workflows/heads.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
jobs:
2929
test:
30-
name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
30+
name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
3131
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3232
runs-on: ubuntu-latest
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -56,6 +56,7 @@ jobs:
5656

5757
# jruby-head
5858
- ruby: "jruby-head"
59+
if: ${{ !env.ACT }}
5960
appraisal_name: "heads"
6061
exec_cmd: "rake test"
6162
gemfile: "Appraisal.root"

β€Ž.github/workflows/jruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ concurrency:
2727

2828
jobs:
2929
test:
30-
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
31-
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
30+
name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
31+
if: ${{ !env.ACT && !contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]') }}
3232
runs-on: ubuntu-22.04
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
3434
env: # $BUNDLE_GEMFILE - set at job level, so applies to all steps

β€Ž.github/workflows/legacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
jobs:
2929
test:
30-
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
30+
name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
3131
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3232
runs-on: ubuntu-22.04
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

β€Ž.github/workflows/supported.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
jobs:
2929
test:
30-
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
30+
name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
3131
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3232
runs-on: ubuntu-latest
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

β€Ž.github/workflows/unsupported.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
jobs:
2929
test:
30-
name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
30+
name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
3131
if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
3232
runs-on: ubuntu-22.04
3333
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}

β€Ž.idea/workspace.xml

Lines changed: 31 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€ŽGemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ latest_ruby_version = Gem::Version.create("3.4")
1313
current_ruby_version = Gem::Version.create(RUBY_VERSION)
1414

1515
### Std Lib Extracted Gems
16-
eval_gemfile "gemfiles/modular/x_std_libs/r3/libs.gemfile"
16+
if ENV.fetch("DEP_HEADS", "false").casecmp?("true")
17+
eval_gemfile("gemfiles/modular/runtime_heads.gemfile")
18+
else
19+
eval_gemfile "gemfiles/modular/x_std_libs/r3/libs.gemfile"
20+
end
1721

1822
# Specify your gem's dependencies in ruby-openid.gemspec
1923
gemspec

0 commit comments

Comments
Β (0)