Skip to content

Commit 584ee8a

Browse files
committedMar 11, 2024·
Merge branch 'master' of https://github.com/reduxjs/react-redux into migrate-typetests-to-vitest
2 parents 6e4d4fd + 16dc0ed commit 584ee8a

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed
 

‎.github/workflows/test.yml

+9-22
Original file line numberDiff line numberDiff line change
@@ -164,29 +164,23 @@ jobs:
164164
- name: Clone RTK repo
165165
run: git clone https://github.com/reduxjs/redux-toolkit.git ./redux-toolkit
166166

167+
- name: Cache example deps
168+
uses: actions/cache@v4
169+
with:
170+
path: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}/node_modules
171+
key: test-published-artifact-${{ matrix.example }}-node_modules
172+
167173
- name: Check folder contents
168174
run: ls -l .
169175

170-
# Some weird install diffs with cloning this repo and installing.
171-
# Just kill the lockfiles for React-Redux and RTK and reinstall
172-
173-
- name: Remove React-Redux lockfile
174-
run: rm yarn.lock && rm package.json
175-
176-
- name: Remove RTK lockfile
177-
working-directory: ./redux-toolkit
178-
run: rm yarn.lock && rm package.json
179-
180-
- name: Install deps
176+
- name: Install example deps
181177
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
182-
env:
183-
YARN_ENABLE_IMMUTABLE_INSTALLS: false
184-
run: rm yarn.lock && yarn install
178+
run: yarn install
185179

186180
- name: Install Playwright browser if necessary
187181
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
188182
continue-on-error: true
189-
run: yarn playwright install
183+
run: yarn playwright install || true
190184

191185
- uses: actions/download-artifact@v4
192186
with:
@@ -205,13 +199,6 @@ jobs:
205199
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
206200
run: yarn info react-redux && yarn why react-redux
207201

208-
- name: Set up JDK 17 for React Native build
209-
if: matrix.example == 'react-native'
210-
uses: actions/setup-java@v4
211-
with:
212-
java-version: '17.x'
213-
distribution: 'temurin'
214-
215202
- name: Build example
216203
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
217204
env:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ coverage
55
es
66
temp/
77
react-redux-*/
8+
redux-toolkit/
89
.vscode/
910

1011
.cache/

0 commit comments

Comments
 (0)
Please sign in to comment.