Skip to content

Commit 8335cdf

Browse files
danichegdanicheg
committed
Rename root -> cats in build.sbt
1 parent 0633e01 commit 8335cdf

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

‎.github/workflows/ci.yml

+58-58
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
os: [ubuntu-latest]
3131
scala: [2.12, 2.13, 3]
3232
java: [temurin@8, temurin@17, graalvm@17]
33-
project: [rootJS, rootJVM, rootNative]
33+
project: [catsNative, catsJS, catsJVM]
3434
exclude:
3535
- scala: 2.12
3636
java: temurin@17
@@ -40,13 +40,13 @@ jobs:
4040
java: temurin@17
4141
- scala: 3
4242
java: graalvm@17
43-
- project: rootJS
43+
- project: catsNative
4444
java: temurin@17
45-
- project: rootJS
45+
- project: catsNative
4646
java: graalvm@17
47-
- project: rootNative
47+
- project: catsJS
4848
java: temurin@17
49-
- project: rootNative
49+
- project: catsJS
5050
java: graalvm@17
5151
runs-on: ${{ matrix.os }}
5252
timeout-minutes: 60
@@ -106,14 +106,14 @@ jobs:
106106
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
107107
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
108108

109-
- name: scalaJSLink
110-
if: matrix.project == 'rootJS'
111-
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
112-
113109
- name: nativeLink
114-
if: matrix.project == 'rootNative'
110+
if: matrix.project == 'catsNative'
115111
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
116112

113+
- name: scalaJSLink
114+
if: matrix.project == 'catsJS'
115+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
116+
117117
- name: Test
118118
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
119119

@@ -198,92 +198,92 @@ jobs:
198198
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
199199
run: sbt +update
200200

201-
- name: Download target directories (2.12, rootJS)
201+
- name: Download target directories (2.12, catsNative)
202202
uses: actions/download-artifact@v4
203203
with:
204-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
204+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-catsNative
205205

206-
- name: Inflate target directories (2.12, rootJS)
206+
- name: Inflate target directories (2.12, catsNative)
207207
run: |
208208
tar xf targets.tar
209209
rm targets.tar
210210
211-
- name: Download target directories (2.12, rootJVM)
211+
- name: Download target directories (2.12, catsJS)
212212
uses: actions/download-artifact@v4
213213
with:
214-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
214+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-catsJS
215215

216-
- name: Inflate target directories (2.12, rootJVM)
216+
- name: Inflate target directories (2.12, catsJS)
217217
run: |
218218
tar xf targets.tar
219219
rm targets.tar
220220
221-
- name: Download target directories (2.12, rootNative)
221+
- name: Download target directories (2.12, catsJVM)
222222
uses: actions/download-artifact@v4
223223
with:
224-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
224+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-catsJVM
225225

226-
- name: Inflate target directories (2.12, rootNative)
226+
- name: Inflate target directories (2.12, catsJVM)
227227
run: |
228228
tar xf targets.tar
229229
rm targets.tar
230230
231-
- name: Download target directories (2.13, rootJS)
231+
- name: Download target directories (2.13, catsNative)
232232
uses: actions/download-artifact@v4
233233
with:
234-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
234+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-catsNative
235235

236-
- name: Inflate target directories (2.13, rootJS)
236+
- name: Inflate target directories (2.13, catsNative)
237237
run: |
238238
tar xf targets.tar
239239
rm targets.tar
240240
241-
- name: Download target directories (2.13, rootJVM)
241+
- name: Download target directories (2.13, catsJS)
242242
uses: actions/download-artifact@v4
243243
with:
244-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
244+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-catsJS
245245

246-
- name: Inflate target directories (2.13, rootJVM)
246+
- name: Inflate target directories (2.13, catsJS)
247247
run: |
248248
tar xf targets.tar
249249
rm targets.tar
250250
251-
- name: Download target directories (2.13, rootNative)
251+
- name: Download target directories (2.13, catsJVM)
252252
uses: actions/download-artifact@v4
253253
with:
254-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
254+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-catsJVM
255255

256-
- name: Inflate target directories (2.13, rootNative)
256+
- name: Inflate target directories (2.13, catsJVM)
257257
run: |
258258
tar xf targets.tar
259259
rm targets.tar
260260
261-
- name: Download target directories (3, rootJS)
261+
- name: Download target directories (3, catsNative)
262262
uses: actions/download-artifact@v4
263263
with:
264-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
264+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-catsNative
265265

266-
- name: Inflate target directories (3, rootJS)
266+
- name: Inflate target directories (3, catsNative)
267267
run: |
268268
tar xf targets.tar
269269
rm targets.tar
270270
271-
- name: Download target directories (3, rootJVM)
271+
- name: Download target directories (3, catsJS)
272272
uses: actions/download-artifact@v4
273273
with:
274-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
274+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-catsJS
275275

276-
- name: Inflate target directories (3, rootJVM)
276+
- name: Inflate target directories (3, catsJS)
277277
run: |
278278
tar xf targets.tar
279279
rm targets.tar
280280
281-
- name: Download target directories (3, rootNative)
281+
- name: Download target directories (3, catsJVM)
282282
uses: actions/download-artifact@v4
283283
with:
284-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
284+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-catsJVM
285285

286-
- name: Inflate target directories (3, rootNative)
286+
- name: Inflate target directories (3, catsJVM)
287287
run: |
288288
tar xf targets.tar
289289
rm targets.tar
@@ -372,7 +372,7 @@ jobs:
372372
- name: Submit Dependencies
373373
uses: scalacenter/sbt-dependency-submission@v2
374374
with:
375-
modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 docs_2.12 docs_2.13 docs_3 cats-tests_sjs1_2.12 cats-tests_sjs1_2.13 cats-tests_sjs1_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 cats-tests_2.12 cats-tests_2.13 cats-tests_3 bincompattest_2.12 bincompattest_2.13 bincompattest_3 cats-tests_native0.5_2.12 cats-tests_native0.5_2.13 cats-tests_native0.5_3 cats-bench_2.12 cats-bench_2.13 cats-bench_3
375+
modules-ignore: catsnative_2.12 catsnative_2.13 catsnative_3 docs_2.12 docs_2.13 docs_3 cats-tests_sjs1_2.12 cats-tests_sjs1_2.13 cats-tests_sjs1_3 cats-tests_2.12 cats-tests_2.13 cats-tests_3 catsjs_2.12 catsjs_2.13 catsjs_3 catsjvm_2.12 catsjvm_2.13 catsjvm_3 bincompattest_2.12 bincompattest_2.13 bincompattest_3 cats-tests_native0.5_2.12 cats-tests_native0.5_2.13 cats-tests_native0.5_3 cats-bench_2.12 cats-bench_2.13 cats-bench_3
376376
configs-ignore: test scala-tool scala-doc-tool test-internal
377377

378378
validate-steward:
@@ -400,12 +400,12 @@ jobs:
400400

401401
- run: scala-steward validate-repo-config .scala-steward.conf
402402

403-
scalafix:
404-
name: Scalafix
403+
site:
404+
name: Generate Site
405405
strategy:
406406
matrix:
407407
os: [ubuntu-latest]
408-
java: [temurin@8]
408+
java: [temurin@17]
409409
runs-on: ${{ matrix.os }}
410410
steps:
411411
- name: Install sbt
@@ -456,17 +456,23 @@ jobs:
456456
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
457457
run: sbt +update
458458

459-
- name: Scalafix tests
460-
run: |
461-
cd scalafix
462-
sbt test
459+
- name: Generate site
460+
run: sbt docs/tlSite
463461

464-
site:
465-
name: Generate Site
462+
- name: Publish site
463+
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
464+
uses: peaceiris/[email protected]
465+
with:
466+
github_token: ${{ secrets.GITHUB_TOKEN }}
467+
publish_dir: site/target/docs/site
468+
keep_files: true
469+
470+
scalafix:
471+
name: Scalafix
466472
strategy:
467473
matrix:
468474
os: [ubuntu-latest]
469-
java: [temurin@17]
475+
java: [temurin@8]
470476
runs-on: ${{ matrix.os }}
471477
steps:
472478
- name: Install sbt
@@ -517,13 +523,7 @@ jobs:
517523
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
518524
run: sbt +update
519525

520-
- name: Generate site
521-
run: sbt docs/tlSite
522-
523-
- name: Publish site
524-
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
525-
uses: peaceiris/[email protected]
526-
with:
527-
github_token: ${{ secrets.GITHUB_TOKEN }}
528-
publish_dir: site/target/docs/site
529-
keep_files: true
526+
- name: Scalafix tests
527+
run: |
528+
cd scalafix
529+
sbt test

‎build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ lazy val testingDependencies = Seq(
8888
)
8989
)
9090

91-
lazy val root = tlCrossRootProject
91+
lazy val cats = tlCrossRootProject
9292
.aggregate(
9393
kernel,
9494
kernelLaws,

0 commit comments

Comments
 (0)