Skip to content

Commit e8fe210

Browse files
authored
Condense integration workflows (#15169)
1 parent 6002360 commit e8fe210

13 files changed

Lines changed: 191 additions & 230 deletions

.github/workflows/integration-full.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/integration-pr-ubuntu.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/integration-pr-windows-macos.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
node-version: ${{ matrix.node }}
5050
cache: "pnpm"
5151

52-
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
53-
# - uses: google/wireit@setup-github-actions-caching/v2
52+
- name: Setup wireit cache ${{ matrix.node }}
53+
uses: google/wireit@setup-github-actions-caching/v2.0.4
5454

5555
- name: Disable GitHub Actions Annotations
5656
run: |

.github/workflows/pr-actions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PR (Actions)
1+
name: PR Actions
22

33
# Triggered when "PR (Check)" completes. Downloads the artifact produced by
44
# the upstream workflow and applies the recorded actions (sticky comments,
@@ -7,12 +7,12 @@ name: PR (Actions)
77

88
on:
99
workflow_run:
10-
workflows: ["PR (Check)"]
10+
workflows: ["PR Checks"]
1111
types: [completed]
1212

1313
jobs:
1414
actions:
15-
name: PR (Actions)
15+
name: Actions
1616
if: >
1717
github.event.workflow_run.conclusion == 'success' &&
1818
github.repository == 'remix-run/react-router'

.github/workflows/pr-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PR (Check)
1+
name: PR Checks
22

33
# Read-only PR inspection. Computes a list of "actions" (sticky comments,
44
# label changes, close, etc.) and uploads them as an artifact. The PR (Actions)
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
check:
18-
name: 🔍 Check PR
18+
name: Checks
1919
if: github.repository == 'remix-run/react-router'
2020
runs-on: ubuntu-latest
2121
permissions:

.github/workflows/release-comments.yml renamed to .github/workflows/release-comments-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99

1010
jobs:
1111
comment:
12-
name: 📝 Comment on released issues/pull requests
12+
name: Comment on released issues/pull requests
1313
runs-on: ubuntu-latest
1414
permissions:
1515
issues: write # enable commenting on released issues

.github/workflows/release.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# - v8 prereleases (from a workflow_dispatch trigger on the v8 branch)
99
# - Experimental releases (from a workflow_dispatch trigger)
1010

11-
name: 🚢 Release/Publish
11+
name: Release
1212

1313
on:
1414
push:
@@ -109,19 +109,19 @@ jobs:
109109
contents: write # enable pushing changes to the origin
110110
id-token: write # enable generation of an ID token for publishing
111111
steps:
112-
- name: ⬇️ Checkout repo
112+
- name: Checkout repo
113113
uses: actions/checkout@v6
114114

115-
- name: 📦 Setup pnpm
115+
- name: Setup pnpm
116116
uses: pnpm/action-setup@v6
117117

118-
- name: Setup node
118+
- name: Setup node
119119
uses: actions/setup-node@v6
120120
with:
121121
node-version-file: ".nvmrc"
122122
package-manager-cache: false
123123

124-
- name: 📥 Install deps
124+
- name: Install deps
125125
run: pnpm install --frozen-lockfile
126126

127127
- name: Build packages
@@ -133,31 +133,31 @@ jobs:
133133
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
134134

135135
comment:
136-
name: 📝 Comment on released issues/pull requests
136+
name: Comment on released issues/pull requests
137137
needs: publish
138138
runs-on: ubuntu-latest
139139
permissions:
140140
issues: write # enable commenting on released issues
141141
pull-requests: write # enable commenting on released pull requests
142142
steps:
143-
- name: ⬇️ Checkout repo
143+
- name: Checkout repo
144144
uses: actions/checkout@v6
145145
with:
146146
fetch-depth: 0
147147

148-
- name: 📦 Setup pnpm
148+
- name: Setup pnpm
149149
uses: pnpm/action-setup@v6
150150

151-
- name: Setup node
151+
- name: Setup node
152152
uses: actions/setup-node@v6
153153
with:
154154
node-version-file: ".nvmrc"
155155
package-manager-cache: false
156156

157-
- name: 📥 Install deps
157+
- name: Install deps
158158
run: pnpm install --frozen-lockfile
159159

160-
- name: 📝 Comment on released issues and pull requests
160+
- name: Comment on released issues and pull requests
161161
env:
162162
GH_TOKEN: ${{ github.token }}
163163
run: pnpm run release-comments
@@ -170,67 +170,67 @@ jobs:
170170
contents: read
171171
id-token: write # enable generation of an ID token for publishing
172172
steps:
173-
- name: ⬇️ Checkout repo
173+
- name: Checkout repo
174174
uses: actions/checkout@v6
175175
with:
176176
ref: ${{ github.event.inputs.branch }}
177177
fetch-depth: 0 # needed for tags
178178

179-
- name: 📦 Setup pnpm
179+
- name: Setup pnpm
180180
uses: pnpm/action-setup@v6
181181

182-
- name: Setup node
182+
- name: Setup node
183183
uses: actions/setup-node@v6
184184
with:
185185
node-version-file: ".nvmrc"
186186
package-manager-cache: false
187187

188-
- name: 📥 Install deps
188+
- name: Install deps
189189
run: pnpm install --frozen-lockfile
190190

191-
- name: 🏗 Build
191+
- name: Build
192192
run: pnpm build
193193

194-
- name: 🚀 Publish prerelease
194+
- name: Publish prerelease
195195
run: pnpm prerelease:publish
196196

197197
experimental-release:
198-
name: 🧪 Experimental Release
198+
name: Experimental Release
199199
if: github.repository == 'remix-run/react-router' && github.event_name == 'workflow_dispatch' && github.event.inputs.branch != 'v8'
200200
runs-on: ubuntu-latest
201201
permissions:
202202
contents: write # enable pushing changes to the origin
203203
id-token: write # enable generation of an ID token for publishing
204204
steps:
205-
- name: ⬇️ Checkout repo
205+
- name: Checkout repo
206206
uses: actions/checkout@v6
207207
with:
208208
ref: ${{ github.event.inputs.branch }}
209209
# checkout using a custom token so that we can push later on
210210
token: ${{ secrets.GITHUB_TOKEN }}
211211
fetch-depth: 0
212212

213-
- name: 📦 Setup pnpm
213+
- name: Setup pnpm
214214
uses: pnpm/action-setup@v6
215215

216-
- name: Setup node
216+
- name: Setup node
217217
uses: actions/setup-node@v6
218218
with:
219219
node-version-file: ".nvmrc"
220220
package-manager-cache: false
221221

222-
- name: 📥 Install deps
222+
- name: Install deps
223223
run: pnpm install --frozen-lockfile
224224

225-
- name: ⤴️ Update version
225+
- name: Update version
226226
run: |
227227
git config --local user.email "hello@remix.run"
228228
git config --local user.name "Remix Run Bot"
229229
pnpm run experimental:version
230230
git push origin --tags
231231
232-
- name: 🏗 Build
232+
- name: Build
233233
run: pnpm build
234234

235-
- name: 🚀 Publish
235+
- name: Publish
236236
run: pnpm run experimental:publish

.github/workflows/shared-build.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)