Skip to content

Commit ceb84ab

Browse files
alexeyralexeyr
committed
Fix Actionlint issues
1 parent c715f03 commit ceb84ab

File tree

3 files changed

+36
-13
lines changed

3 files changed

+36
-13
lines changed

‎.github/workflows/examples.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,19 @@ jobs:
6161
path: vendor/bundle
6262
key: package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}-${{ hashFiles('Gemfile.development_dependencies') }}-${{ matrix.versions }}
6363
- id: get-sha
64-
run: echo "::set-output name=sha::$(git rev-parse HEAD)"
64+
run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
6565
- name: Install Node modules with Yarn for renderer package
6666
run: |
6767
yarn install --no-progress --no-emoji
6868
sudo yarn global add yalc
6969
- name: yalc publish for react-on-rails
7070
run: yalc publish
7171
- name: Install Ruby Gems for package
72-
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
72+
run: |
73+
bundle lock --add-platform 'x86_64-linux'
74+
if ! bundle check --path=vendor/bundle; then
75+
bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
76+
fi
7377
- name: Ensure minimum required Chrome version
7478
run: |
7579
echo -e "Already installed $(google-chrome --version)\n"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,14 @@ jobs:
5252
- name: Install Node modules with Yarn for dummy app
5353
run: cd spec/dummy && yarn install --ignore-scripts --no-progress --no-emoji
5454
- name: Install Ruby Gems for dummy app
55-
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
55+
run: |
56+
cd spec/dummy
57+
bundle lock --add-platform 'x86_64-linux'
58+
if ! bundle check --path=vendor/bundle; then
59+
bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
60+
fi
5661
- name: generate file system-based packs
57-
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
62+
run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
5863
- name: Detect dead code
5964
run: |
6065
yarn run knip

‎.github/workflows/main.yml‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,18 @@ jobs:
6767
path: spec/dummy/vendor/bundle
6868
key: dummy-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}-${{ hashFiles('Gemfile.development_dependencies') }}-${{ matrix.versions }}
6969
- name: Install Ruby Gems for dummy app
70-
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
70+
run: |
71+
cd spec/dummy
72+
bundle lock --add-platform 'x86_64-linux'
73+
if ! bundle check --path=vendor/bundle; then
74+
bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
75+
fi
7176
- name: generate file system-based packs
72-
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
77+
run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
7378
- name: Build test bundles for dummy app
74-
run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV=test NODE_ENV=test bin/${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer
79+
run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer
7580
- id: get-sha
76-
run: echo "::set-output name=sha::$(git rev-parse HEAD)"
81+
run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
7782
- name: Save test webpack bundles to cache (for build number checksum used by rspec job)
7883
uses: actions/cache/save@v4
7984
with:
@@ -133,7 +138,7 @@ jobs:
133138
path: spec/dummy/node_modules
134139
key: dummy-app-node-modules-cache-${{ hashFiles('spec/dummy/package.json') }}-${{ matrix.versions }}
135140
- id: get-sha
136-
run: echo "::set-output name=sha::$(git rev-parse HEAD)"
141+
run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
137142
- name: Save test webpack bundles to cache (for build number checksum used by rspec job)
138143
uses: actions/cache@v4
139144
with:
@@ -150,15 +155,24 @@ jobs:
150155
- name: Install Node modules with Yarn for dummy app
151156
run: cd spec/dummy && yarn install --no-progress --no-emoji
152157
- name: Install Ruby Gems for package
153-
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
158+
run: |
159+
bundle lock --add-platform 'x86_64-linux'
160+
if ! bundle check --path=vendor/bundle; then
161+
bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
162+
fi
154163
- name: Install Ruby Gems for dummy app
155-
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
164+
run: |
165+
cd spec/dummy
166+
bundle lock --add-platform 'x86_64-linux'
167+
if ! bundle check --path=vendor/bundle; then
168+
bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
169+
fi
156170
- name: Ensure minimum required Chrome version
157171
run: |
158172
echo -e "Already installed $(google-chrome --version)\n"
159173
MINIMUM_REQUIRED_CHROME_VERSION=75
160174
INSTALLED_CHROME_MAJOR_VERSION="$(google-chrome --version | tr ' .' '\t' | cut -f3)"
161-
if [[ $INSTALLED_CHROME_MAJOR_VERSION < $MINIMUM_REQUIRED_CHROME_VERSION ]]; then
175+
if [[ $INSTALLED_CHROME_MAJOR_VERSION -lt $MINIMUM_REQUIRED_CHROME_VERSION ]]; then
162176
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
163177
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
164178
sudo apt-get update
@@ -168,7 +182,7 @@ jobs:
168182
- name: Increase the amount of inotify watchers
169183
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
170184
- name: generate file system-based packs
171-
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
185+
run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
172186
- name: Git Stuff
173187
if: matrix.versions == 'oldest'
174188
run: |

0 commit comments

Comments
 (0)