Fix failing install generator tests for v16 #1784
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,9 +11,10 @@ jobs: | |||||||||||||||||||||||||||||||||||||||
| strategy: | ||||||||||||||||||||||||||||||||||||||||
| fail-fast: false | ||||||||||||||||||||||||||||||||||||||||
| matrix: | ||||||||||||||||||||||||||||||||||||||||
| ruby-version: ['3.2', '3.4'] | ||||||||||||||||||||||||||||||||||||||||
| dependency-level: ['minimum', 'latest'] | ||||||||||||||||||||||||||||||||||||||||
| env: | ||||||||||||||||||||||||||||||||||||||||
| BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }} | ||||||||||||||||||||||||||||||||||||||||
| runs-on: ubuntu-22.04 | ||||||||||||||||||||||||||||||||||||||||
| steps: | ||||||||||||||||||||||||||||||||||||||||
| - uses: actions/checkout@v4 | ||||||||||||||||||||||||||||||||||||||||
|
|
@@ -22,7 +23,7 @@ jobs: | |||||||||||||||||||||||||||||||||||||||
| - name: Setup Ruby | ||||||||||||||||||||||||||||||||||||||||
| uses: ruby/setup-ruby@v1 | ||||||||||||||||||||||||||||||||||||||||
| with: | ||||||||||||||||||||||||||||||||||||||||
| ruby-version: ${{ matrix.ruby-version }} | ||||||||||||||||||||||||||||||||||||||||
| bundler: 2.5.9 | ||||||||||||||||||||||||||||||||||||||||
| - name: Print system information | ||||||||||||||||||||||||||||||||||||||||
| run: | | ||||||||||||||||||||||||||||||||||||||||
|
|
@@ -33,34 +34,34 @@ jobs: | |||||||||||||||||||||||||||||||||||||||
| echo "Node version: "; node -v | ||||||||||||||||||||||||||||||||||||||||
| echo "Yarn version: "; yarn --version | ||||||||||||||||||||||||||||||||||||||||
| echo "Bundler version: "; bundle --version | ||||||||||||||||||||||||||||||||||||||||
| - name: run conversion script to use minimum supported dependency versions | ||||||||||||||||||||||||||||||||||||||||
| if: matrix.dependency-level == 'minimum' | ||||||||||||||||||||||||||||||||||||||||
| run: script/convert | ||||||||||||||||||||||||||||||||||||||||
| - name: Save root ruby gems to cache | ||||||||||||||||||||||||||||||||||||||||
| uses: actions/cache@v4 | ||||||||||||||||||||||||||||||||||||||||
| with: | ||||||||||||||||||||||||||||||||||||||||
| path: vendor/bundle | ||||||||||||||||||||||||||||||||||||||||
| key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||||||||||||||||||||||||||||||||||||||||
| - name: Install Ruby Gems for package | ||||||||||||||||||||||||||||||||||||||||
| run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 | ||||||||||||||||||||||||||||||||||||||||
| - name: Git Stuff | ||||||||||||||||||||||||||||||||||||||||
| if: matrix.dependency-level == 'minimum' | ||||||||||||||||||||||||||||||||||||||||
| run: | | ||||||||||||||||||||||||||||||||||||||||
| git config user.email "you@example.com" | ||||||||||||||||||||||||||||||||||||||||
| git config user.name "Your Name" | ||||||||||||||||||||||||||||||||||||||||
| git commit -am "stop generators from complaining about uncommitted code" | ||||||||||||||||||||||||||||||||||||||||
| - name: Set dependency level environment variable | ||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
47
to
+53
There was a problem hiding this comment. Make “Git Stuff” resilient when there’s nothing to commit.
Apply: - - name: Git Stuff
+ - name: Git Stuff
if: matrix.dependency-level == 'minimum'
run: |
git config user.email "you@example.com"
git config user.name "Your Name"
- git commit -am "stop generators from complaining about uncommitted code"
+ # Commit only if there are changes
+ if ! git diff --quiet; then
+ git commit -am "stop generators from complaining about uncommitted code"
+ fi📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||
| run: | | ||||||||||||||||||||||||||||||||||||||||
| echo "CI_DEPENDENCY_LEVEL=${{ matrix.dependency-level }}" >> $GITHUB_ENV | ||||||||||||||||||||||||||||||||||||||||
| - name: Run rspec tests | ||||||||||||||||||||||||||||||||||||||||
| run: bundle exec rspec spec/react_on_rails | ||||||||||||||||||||||||||||||||||||||||
| - name: Store test results | ||||||||||||||||||||||||||||||||||||||||
| uses: actions/upload-artifact@v4 | ||||||||||||||||||||||||||||||||||||||||
| with: | ||||||||||||||||||||||||||||||||||||||||
| name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||||||||||||||||||||||||||||||||||||||||
| path: ~/rspec | ||||||||||||||||||||||||||||||||||||||||
| - name: Store artifacts | ||||||||||||||||||||||||||||||||||||||||
| uses: actions/upload-artifact@v4 | ||||||||||||||||||||||||||||||||||||||||
| with: | ||||||||||||||||||||||||||||||||||||||||
| name: main-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||||||||||||||||||||||||||||||||||||||||
| path: log/test.log | ||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,9 @@ spec/dummy/public | |
| **/*generated* | ||
| *.res.js | ||
|
|
||
| # Prettier doesn't understand ERB syntax in YAML files and can damage templates | ||
| .rubocop.yml | ||
| *.yml | ||
| *.yaml | ||
| # Intentionally invalid | ||
| spec/react_on_rails/fixtures/i18n/locales_symbols/ | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Prevent empty-commit failure.
git commit -amexits non‑zero when no changes; guard it.📝 Committable suggestion
🤖 Prompt for AI Agents