Skip to content

Commit 5752bf7

Browse files
satorgsatorg
authored
Merge pull request #463 from danicheg/fix-root-module-name
Fix root module name
2 parents 09f8de0 + 17b0d03 commit 5752bf7

File tree

3 files changed

+44
-48
lines changed

3 files changed

+44
-48
lines changed

‎.github/workflows/ci.yml

+34-34
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]
33-
project: [rootJS, rootJVM, rootNative]
33+
project: [disciplineNative, disciplineJS, disciplineJVM]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
@@ -63,14 +63,14 @@ jobs:
6363
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
6464
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6565

66-
- name: scalaJSLink
67-
if: matrix.project == 'rootJS'
68-
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
69-
7066
- name: nativeLink
71-
if: matrix.project == 'rootNative'
67+
if: matrix.project == 'disciplineNative'
7268
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
7369

70+
- name: scalaJSLink
71+
if: matrix.project == 'disciplineJS'
72+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
73+
7474
- name: Test
7575
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7676

@@ -129,92 +129,92 @@ jobs:
129129
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
130130
run: sbt +update
131131

132-
- name: Download target directories (2.12, rootJS)
132+
- name: Download target directories (2.12, disciplineNative)
133133
uses: actions/download-artifact@v4
134134
with:
135-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
135+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineNative
136136

137-
- name: Inflate target directories (2.12, rootJS)
137+
- name: Inflate target directories (2.12, disciplineNative)
138138
run: |
139139
tar xf targets.tar
140140
rm targets.tar
141141
142-
- name: Download target directories (2.12, rootJVM)
142+
- name: Download target directories (2.12, disciplineJS)
143143
uses: actions/download-artifact@v4
144144
with:
145-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
145+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJS
146146

147-
- name: Inflate target directories (2.12, rootJVM)
147+
- name: Inflate target directories (2.12, disciplineJS)
148148
run: |
149149
tar xf targets.tar
150150
rm targets.tar
151151
152-
- name: Download target directories (2.12, rootNative)
152+
- name: Download target directories (2.12, disciplineJVM)
153153
uses: actions/download-artifact@v4
154154
with:
155-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
155+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJVM
156156

157-
- name: Inflate target directories (2.12, rootNative)
157+
- name: Inflate target directories (2.12, disciplineJVM)
158158
run: |
159159
tar xf targets.tar
160160
rm targets.tar
161161
162-
- name: Download target directories (2.13, rootJS)
162+
- name: Download target directories (2.13, disciplineNative)
163163
uses: actions/download-artifact@v4
164164
with:
165-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
165+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineNative
166166

167-
- name: Inflate target directories (2.13, rootJS)
167+
- name: Inflate target directories (2.13, disciplineNative)
168168
run: |
169169
tar xf targets.tar
170170
rm targets.tar
171171
172-
- name: Download target directories (2.13, rootJVM)
172+
- name: Download target directories (2.13, disciplineJS)
173173
uses: actions/download-artifact@v4
174174
with:
175-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
175+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJS
176176

177-
- name: Inflate target directories (2.13, rootJVM)
177+
- name: Inflate target directories (2.13, disciplineJS)
178178
run: |
179179
tar xf targets.tar
180180
rm targets.tar
181181
182-
- name: Download target directories (2.13, rootNative)
182+
- name: Download target directories (2.13, disciplineJVM)
183183
uses: actions/download-artifact@v4
184184
with:
185-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
185+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJVM
186186

187-
- name: Inflate target directories (2.13, rootNative)
187+
- name: Inflate target directories (2.13, disciplineJVM)
188188
run: |
189189
tar xf targets.tar
190190
rm targets.tar
191191
192-
- name: Download target directories (3, rootJS)
192+
- name: Download target directories (3, disciplineNative)
193193
uses: actions/download-artifact@v4
194194
with:
195-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
195+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineNative
196196

197-
- name: Inflate target directories (3, rootJS)
197+
- name: Inflate target directories (3, disciplineNative)
198198
run: |
199199
tar xf targets.tar
200200
rm targets.tar
201201
202-
- name: Download target directories (3, rootJVM)
202+
- name: Download target directories (3, disciplineJS)
203203
uses: actions/download-artifact@v4
204204
with:
205-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
205+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJS
206206

207-
- name: Inflate target directories (3, rootJVM)
207+
- name: Inflate target directories (3, disciplineJS)
208208
run: |
209209
tar xf targets.tar
210210
rm targets.tar
211211
212-
- name: Download target directories (3, rootNative)
212+
- name: Download target directories (3, disciplineJVM)
213213
uses: actions/download-artifact@v4
214214
with:
215-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
215+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJVM
216216

217-
- name: Inflate target directories (3, rootNative)
217+
- name: Inflate target directories (3, disciplineJVM)
218218
run: |
219219
tar xf targets.tar
220220
rm targets.tar
@@ -277,5 +277,5 @@ jobs:
277277
- name: Submit Dependencies
278278
uses: scalacenter/sbt-dependency-submission@v2
279279
with:
280-
modules-ignore: discipline_2.12 discipline_2.13 discipline_3 discipline_2.12 discipline_2.13 discipline_3 discipline_2.12 discipline_2.13 discipline_3
280+
modules-ignore: disciplinenative_2.12 disciplinenative_2.13 disciplinenative_3 disciplinejs_2.12 disciplinejs_2.13 disciplinejs_3 disciplinejvm_2.12 disciplinejvm_2.13 disciplinejvm_3
281281
configs-ignore: test scala-tool scala-doc-tool test-internal

‎.mergify.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ pull_request_rules:
1010
conditions:
1111
- author=scala-steward
1212
- body~=labels:.*early-semver-patch
13-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJS)
14-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJVM)
15-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootNative)
16-
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJS)
17-
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJVM)
18-
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootNative)
19-
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJS)
20-
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJVM)
21-
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootNative)
13+
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineNative)
14+
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJS)
15+
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJVM)
16+
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineNative)
17+
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJS)
18+
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJVM)
19+
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineNative)
20+
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJS)
21+
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJVM)
2222
actions:
2323
merge: {}
2424
- name: Label core PRs

‎build.sbt

+1-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ ThisBuild / tlJdkRelease := Some(8)
1414

1515
ThisBuild / tlSonatypeUseLegacyHost := false
1616

17-
lazy val root = tlCrossRootProject
18-
.aggregate(core)
19-
.settings(
20-
name := "discipline"
21-
)
17+
lazy val discipline = tlCrossRootProject.aggregate(core)
2218

2319
lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
2420
.crossType(CrossType.Pure)

0 commit comments

Comments
 (0)