Skip to content

Commit 978e0b8

Browse files
committed
Update pipelines to new module build setup
1 parent f8686a4 commit 978e0b8

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

.github/workflows/pull-request-check.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,13 @@ jobs:
6868
export MAVEN_OPTS="-Xmx4096m"
6969
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
7070
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
71-
cd tools/samm-cli
72-
unset JAVA_TOOL_OPTIONS
73-
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
7471
shell: bash
7572

7673
- name: Build native image
7774
if: matrix.os != 'macos-13'
7875
run: |
7976
export MAVEN_OPTS="-Xmx4096m"
80-
cd tools/samm-cli
81-
mvn -B package -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
77+
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
8278
shell: bash
8379

8480
- name: Build native image (Mac)

.github/workflows/release-workflow.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Setup JDK
6767
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
6868
with:
69-
java-version: '17.0.8'
69+
java-version: '17.0.10'
7070
distribution: 'graalvm'
7171
components: 'native-image,js'
7272
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -101,11 +101,8 @@ jobs:
101101
# Actual build of core SDK
102102
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean deploy -Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -DaltDeploymentRepository=local::default::file://nexus-staging -Psign
103103
# Build of CLI
104-
pushd tools/samm-cli
105104
unset JAVA_TOOL_OPTIONS
106-
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
107-
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
108-
popd
105+
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
109106
110107
# Create .tar.gz of samm-cli
111108
pushd tools/samm-cli/target
@@ -152,7 +149,7 @@ jobs:
152149
- name: Setup JDK
153150
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
154151
with:
155-
java-version: '17.0.8'
152+
java-version: '17.0.10'
156153
distribution: 'graalvm'
157154
components: 'native-image,js'
158155
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -176,9 +173,8 @@ jobs:
176173
# Actual build of core SDK
177174
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
178175
# Build of CLI
179-
cd tools/samm-cli
180176
unset JAVA_TOOL_OPTIONS
181-
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
177+
mvn -B -pl tools/samm-cli clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
182178
shell: bash
183179

184180
- name: Build native executable
@@ -226,7 +222,7 @@ jobs:
226222
- name: Setup JDK
227223
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
228224
with:
229-
java-version: '17.0.8'
225+
java-version: '17.0.10'
230226
distribution: 'graalvm'
231227
components: 'native-image,js'
232228
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -263,10 +259,8 @@ jobs:
263259
# Actual build of core SDK
264260
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
265261
# Build of CLI
266-
cd tools/samm-cli
267262
unset JAVA_TOOL_OPTIONS
268-
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
269-
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
263+
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
270264
shell: bash
271265

272266
- name: Upload Windows binary

0 commit comments

Comments
 (0)