Skip to content

Commit 1b93043

Browse files
authored
Rebootstrap, add linux-arm test job, make use of selective.resolveChanged (#4359)
1 parent 31d41c0 commit 1b93043

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

.config/mill-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.5-144-22bb1b-native
1+
0.12.5-150-31d41c-native

.github/workflows/post-build-selective.yml

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ jobs:
7777

7878
- run: ./mill -i -k selective.resolveTree ${{ inputs.millargs }}
7979

80+
- run: ./mill -i -k selective.resolveChanged ${{ inputs.millargs }}
81+
8082
- run: ./mill -i -j1 -k selective.run ${{ inputs.millargs }}
8183
if: ${{ inputs.install-android-sdk }}
8284
env:

.github/workflows/run-tests.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,23 @@ jobs:
8383
- run: "echo temurin:17 > .mill-jvm-version"
8484

8585
- uses: actions/setup-node@v4
86-
with:
87-
node-version: '22'
86+
with: { node-version: '22' }
8887

8988
- run: ./mill -i example.scalalib.__.local.server.test
9089

90+
linux-arm:
91+
if: (github.event.action == 'ready_for_review') || (github.event.pull_request.draft == false)
92+
runs-on: ubuntu-24.04-arm
93+
steps:
94+
- uses: actions/checkout@v4
95+
with: { fetch-depth: 1 }
96+
97+
- run: "echo temurin:17 > .mill-jvm-version"
98+
99+
- uses: actions/setup-node@v4
100+
with: { node-version: '22' }
101+
- run: ./mill -i example.kotlinlib.__.local.server.test
102+
91103
linux:
92104
needs: build-linux
93105
strategy:
@@ -115,10 +127,6 @@ jobs:
115127
millargs: "'example.javalib.__.native.server.test'"
116128
install-android-sdk: false
117129

118-
- java-version: 17
119-
millargs: "'example.kotlinlib.__.local.server.test'"
120-
install-android-sdk: false
121-
122130
- java-version: 17
123131
millargs: "'example.android.__.local.server.test'"
124132
install-android-sdk: true

mill

+6-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@ case "$MILL_VERSION" in
108108
*"$MILL_NATIVE_SUFFIX")
109109
MILL_VERSION=${MILL_VERSION%"$MILL_NATIVE_SUFFIX"}
110110
if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" = "Linux" ]; then
111-
ARTIFACT_SUFFIX="-native-linux-amd64"
111+
112+
if [ "$(uname -m)" = "aarch64" ]; then
113+
ARTIFACT_SUFFIX="-native-linux-aarch64"
114+
else
115+
ARTIFACT_SUFFIX="-native-linux-amd64"
116+
fi
112117
elif [ "$(uname)" = "Darwin" ]; then
113118
ARTIFACT_SUFFIX="-native-mac-aarch64"
114119
else

0 commit comments

Comments
 (0)