Skip to content

Commit 7689f47

Browse files
committed
ci: address remaining workflow review
1 parent ebdb399 commit 7689f47

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

.github/actions/setup-bundle/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ runs:
3838
env:
3939
BUNDLE_FROZEN: ${{ inputs.frozen }}
4040
BUNDLE_RETRY: '3'
41+
BUNDLE_JOBS: '4'
4142
with:
4243
ruby-version: ${{ inputs.ruby-version }}
4344
working-directory: ${{ inputs.working-directory }}

.github/actions/setup-ruby/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ runs:
2727
with:
2828
ruby-version: ${{ inputs.ruby-version }}
2929
bundler: ${{ inputs.bundler-version }}
30+
bundler-cache: false

.github/workflows/benchmark.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,13 @@ jobs:
459459
# STEP 6: RUN PRO BENCHMARKS
460460
# ============================================
461461

462+
# bench.rb shells out to `bundle exec rails routes`; pin the Pro dummy
463+
# Gemfile so those calls use the same bundle as the Pro server.
462464
- name: Execute Pro benchmark suite
463465
if: env.RUN_PRO_RAILS
464466
timeout-minutes: 120
467+
env:
468+
BUNDLE_GEMFILE: ${{ github.workspace }}/react_on_rails_pro/spec/dummy/Gemfile
465469
run: |
466470
set -e
467471
echo "🏃 Running Pro benchmark suite..."
@@ -655,14 +659,14 @@ jobs:
655659
# when the pinned hash isn't in its DB. A single combined pattern
656660
# avoids false-positive matches across unrelated lines.
657661
if [ $BENCHER_EXIT_CODE -ne 0 ] && grep -q "Head Version.*not found" "$BENCHER_STDERR" && ! grep -qiE "alert|threshold violation|boundary violation" "$BENCHER_STDERR"; then
658-
# When START_POINT_HASH_ARG is empty (e.g. workflow_dispatch on a
659-
# non-main branch where the merge-base lookup returned ""), the
660-
# substitution is a no-op; the inequality guard below skips the
661-
# redundant retry.
662+
if [ -n "$START_POINT_HASH_ARG" ]; then
662663
RETRY_ARGS="${START_POINT_ARGS/$START_POINT_HASH_ARG/}"
663-
if [ "$RETRY_ARGS" != "$START_POINT_ARGS" ]; then
664-
echo ""
665-
echo "⚠️ Start-point hash not found in Bencher — retrying without --start-point-hash (will use latest baseline)"
664+
else
665+
RETRY_ARGS="$START_POINT_ARGS"
666+
fi
667+
if [ "$RETRY_ARGS" != "$START_POINT_ARGS" ]; then
668+
echo ""
669+
echo "⚠️ Start-point hash not found in Bencher — retrying without --start-point-hash (will use latest baseline)"
666670
echo "::warning::Start-point hash not found in Bencher — falling back to latest baseline for comparison"
667671
set +e
668672
run_bencher "$RETRY_ARGS" > bench_results/bencher_report.html 2>"$BENCHER_STDERR"

.github/workflows/lint-js-and-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Setup Ruby
9999
uses: ./.github/actions/setup-ruby
100100
with:
101-
ruby-version: 3
101+
ruby-version: '3.4'
102102
bundler-version: 2.5.9
103103
- name: Setup Node
104104
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)