Skip to content

Commit 1155e30

Browse files
committed
CI fixes
1 parent 5ad8d84 commit 1155e30

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/gem-tests.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
script/ci-changes-detector "$BASE_REF"
7171
shell: bash
7272

73-
rspec-package-tests:
73+
basic-gem-tests:
7474
needs: detect-changes
7575
# Run on master OR when Ruby tests needed on PR
7676
if: |
@@ -83,6 +83,14 @@ jobs:
8383
BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
8484
runs-on: ubuntu-22.04
8585
steps:
86+
- name: Translate matrix for Ruby and Node versions
87+
id: translate-matrix
88+
run: |
89+
if [ "${{ matrix.dependency-level }}" == "latest" ]; then
90+
echo "ruby-version=3.4" >> "$GITHUB_OUTPUT"
91+
else
92+
echo "ruby-version=3.2" >> "$GITHUB_OUTPUT"
93+
fi
8694
- uses: actions/checkout@v4
8795
with:
8896
persist-credentials: false

rakelib/shakapacker_examples.rake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
3636
sh_in_dir(example_type.dir, "echo \"gem 'shakapacker', '>= 8.2.0'\" >> #{example_type.gemfile}")
3737
bundle_install_in(example_type.dir)
3838
sh_in_dir(example_type.dir, "rake shakapacker:install")
39-
sh_in_dir(example_type.dir, example_type.generator_shell_commands)
39+
# TODO: Remove REACT_ON_RAILS_SKIP_VALIDATION after generators start using next release
40+
generator_commands = example_type.generator_shell_commands.map do |cmd|
41+
"REACT_ON_RAILS_SKIP_VALIDATION=true #{cmd}"
42+
end
43+
sh_in_dir(example_type.dir, generator_commands)
4044
sh_in_dir(example_type.dir, "npm install")
4145
end
4246
end

0 commit comments

Comments
 (0)