Skip to content

Commit 4cf293f

Browse files
committed
.
1 parent 2e15c74 commit 4cf293f

File tree

2 files changed

+4
-193
lines changed

2 files changed

+4
-193
lines changed

.github/workflows/pre-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ jobs:
3535
java-version: ${{ inputs.java-version }}
3636
shell: ${{ inputs.shell }}
3737

38-
- run: ./mill -i -k ${{ inputs.compileargs }}
38+
- run: ./mill -i dist.installLocal
39+
- run: rm -rf out
40+
shell: ${{ inputs.shell }}
41+
- run: ./mill-assembly.jar -i -k ${{ inputs.compileargs }}
3942

4043
- uses: actions/[email protected]
4144
with:

.github/workflows/run-tests.yml

Lines changed: 0 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -71,195 +71,3 @@ jobs:
7171
with:
7272
os: windows-latest
7373
shell: powershell
74-
75-
test-docs:
76-
if: (github.event.action == 'ready_for_review') || (github.event.pull_request.draft == false)
77-
runs-on: ubuntu-latest
78-
steps:
79-
- uses: actions/checkout@v5
80-
with: { fetch-depth: 1 }
81-
82-
- run: ./mill -i website.fastPages + website.checkBrokenLinks
83-
84-
cross-plat:
85-
if: (github.event.action == 'ready_for_review') || (github.event.pull_request.draft == false)
86-
runs-on: ${{ matrix.os }}
87-
strategy:
88-
fail-fast: false
89-
matrix:
90-
# Run these with Mill native launcher as a smoketest
91-
include:
92-
- os: ubuntu-24.04-arm
93-
millargs: "'example.thirdparty[{mockito,netty,arrow}].native.daemon'"
94-
java-version: 17
95-
96-
- os: macos-latest
97-
millargs: "'example.thirdparty[{acyclic,fansi,gatling}].native.daemon'"
98-
java-version: 21
99-
100-
- os: macos-13
101-
millargs: "'example.thirdparty[{jimfs,commons-io}].native.daemon'"
102-
java-version: 24
103-
steps:
104-
- uses: actions/checkout@v5
105-
with: { fetch-depth: 1 }
106-
107-
- uses: ./.github/actions/pre-build-setup
108-
with:
109-
os: ${{ matrix.os }}
110-
java-version: ${{ matrix.java-version }}
111-
shell: bash
112-
113-
- uses: ./.github/actions/post-build-setup
114-
with:
115-
java-version: ${{ matrix.java-version }}
116-
os: ${{ matrix.os }}
117-
118-
- uses: ./.github/actions/post-build-selective
119-
with:
120-
millargs: ${{ matrix.millargs }}
121-
shell: bash
122-
123-
linux:
124-
needs: build-linux
125-
strategy:
126-
fail-fast: false
127-
matrix:
128-
129-
include:
130-
# For most tests, run them arbitrarily on Java 11 or Java 17 on Linux, and
131-
# on the opposite version on Windows below, so we get decent coverage of
132-
# each test on each Java version and each operating system
133-
# We also try to group tests together to manually balance out the runtimes of each jobs
134-
- java-version: 17
135-
millargs: "'{contrib,core,testkit,runner,dist}.__.test'"
136-
137-
- java-version: 17
138-
millargs: "'libs.{scalalib,init,tabcomplete}.__.test'"
139-
install-sbt: true
140-
141-
- java-version: 21
142-
millargs: "'libs.{scalajslib,scalanativelib,kotlinlib,pythonlib,javascriptlib}.__.test'"
143-
144-
- java-version: 17
145-
millargs: "example.kotlinlib.__.shared.daemon"
146-
147-
- java-version: 17
148-
millargs: "example.scalalib.__.shared.daemon"
149-
150-
- java-version: 21
151-
millargs: "example.javalib.__.shared.daemon"
152-
153-
- java-version: 17
154-
millargs: "'example.androidlib.__.shared.daemon'"
155-
setup-android: true
156-
157-
- java-version: 17
158-
millargs: "'example.thirdparty[android-compose-samples].packaged.daemon'"
159-
setup-android: true
160-
161-
- java-version: 24
162-
millargs: "'example.migrating.scalalib.__.shared.daemon'"
163-
install-sbt: true
164-
165-
- java-version: 24
166-
millargs: "'example.{pythonlib,javascriptlib}.__.shared.daemon'"
167-
168-
- java-version: 21
169-
millargs: "'example.{cli,fundamentals,depth,extending,large}.__.shared.daemon'"
170-
171-
- java-version: 21
172-
millargs: "'integration.{feature,ide}.__.packaged.daemon'"
173-
174-
# run this specifically in `native` mode to make sure our non-JVM native image
175-
# launcher is able to bootstrap everything necessary without a JVM installed
176-
- java-version: 17
177-
millargs: "'integration.bootstrap[no-java-bootstrap].native.daemon'"
178-
179-
# These invalidation tests need to be exercised in both execution modes
180-
# to make sure they work with and without -i/--no-server being passed
181-
- java-version: 24
182-
millargs: "'integration.invalidation.__.packaged.nodaemon'"
183-
184-
- java-version: 17
185-
millargs: "'integration.migrating.__.packaged.daemon'"
186-
install-sbt: true
187-
188-
uses: ./.github/workflows/post-build-selective.yml
189-
with:
190-
setup-android: ${{ matrix.setup-android || false }}
191-
install-sbt: ${{ matrix.install-sbt || false }}
192-
install-xvfb: ${{ matrix.install-xvfb || false }}
193-
java-version: ${{ matrix.java-version }}
194-
millargs: ${{ matrix.millargs }}
195-
shell: bash
196-
197-
windows:
198-
needs: build-windows
199-
strategy:
200-
fail-fast: false
201-
matrix:
202-
include:
203-
- java-version: 24
204-
millargs: "'integration.invalidation.__.packaged.daemon'"
205-
206-
- java-version: 17
207-
# turn of parallelism since it sometimes causes issues with concurrent migrations
208-
millargs: '"example.migrating.javalib.__.packaged.daemon"'
209-
extra: "--jobs=1"
210-
- java-version: 21
211-
millargs: '"libs.{util,javalib,androidlib,graphviz}.__.test"'
212-
213-
- java-version: 17
214-
millargs: '"example.scalalib.{basic,publishing}.__.packaged.daemon"'
215-
216-
- java-version: 17
217-
millargs: '"dist.scripts.test"' # run this on both windows and mac to exercise bootstrap scripts
218-
219-
- java-version: 17
220-
millargs: "'integration.failure.__.packaged.nodaemon'"
221-
222-
- java-version: 17
223-
millargs: "'integration.bootstrap[no-java-bootstrap].native.daemon'"
224-
225-
uses: ./.github/workflows/post-build-selective.yml
226-
with:
227-
os: windows-latest
228-
java-version: ${{ matrix.java-version }}
229-
millargs: ${{ matrix.millargs }}
230-
extra: ${{ matrix.extra || '' }}
231-
shell: powershell
232-
233-
itest:
234-
needs: build-linux
235-
strategy:
236-
fail-fast: false
237-
matrix:
238-
include:
239-
# bootstrap tests
240-
- java-version: 17
241-
buildcmd: ci/test-dist-run.sh && ci/test-mill-bootstrap.sh
242-
243-
uses: ./.github/workflows/post-build-raw.yml
244-
with:
245-
java-version: ${{ matrix.java-version }}
246-
buildcmd: ${{ matrix.buildcmd }}
247-
248-
# Scalafmt, Mima, and Scalafix job runs last because it's the least important:
249-
# usually just an automated or mechanical manual fix to do before merging
250-
lint-autofix:
251-
needs: build-linux
252-
uses: ./.github/workflows/post-build-raw.yml
253-
with:
254-
java-version: '17'
255-
buildcmd: |
256-
set -eux
257-
./mill -i mill.scalalib.scalafmt.ScalafmtModule/scalafmt --check + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll
258-
mima:
259-
needs: build-linux
260-
uses: ./.github/workflows/post-build-raw.yml
261-
with:
262-
java-version: '17'
263-
buildcmd: |
264-
set -eux
265-
./mill -i __.mimaReportBinaryIssues

0 commit comments

Comments
 (0)